test without params

westerdaled · Feb 1, 2018 · 01a67c1 · 01a67c1
1 parent 8e2a1e1
commit 01a67c1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.1.sh b/virtual-machines/single-vm/extensions/linux/format-disk.1.sh
@@ -0,0 +1,20 @@
+#
+# format-disk.sh
+#
+#!/bin/bash
+
+partprobe
+# Format and mount drive 
+(
+echo o
+echo n
+echo p
+echo 1
+echo
+echo
+echo w
+)|fdisk /dev/sdd
+partprobe
+mkfs -t ext3 /dev/sdd1
+mkdir /data2
+mount /dev/sdd1 /data2
diff --git a/virtual-machines/single-vm/extensions/linux/format-disk.sh b/virtual-machines/single-vm/extensions/linux/format-disk.sh
@@ -13,8 +13,8 @@ echo 1
 echo
 echo
 echo w
-)|fdisk /dev/$1
+)|fdisk /dev/sdc
 partprobe
-mkfs -t ext3 /dev/$11
-mkdir /data$2
-mount /dev/$11 /data$2
+mkfs -t ext3 /dev/sdc1
+mkdir /data1
+mount /dev/sdc1 /data1
diff --git a/virtual-machines/single-vm/extensions/linux/single-vm.sh b/virtual-machines/single-vm/extensions/linux/single-vm.sh
@@ -3,5 +3,5 @@
 #
 #!/bin/bash
 sh install-apache.sh
-sh format-disk.sh sdc 1
-sh format-disk.sh sdd 2
+sh format-disk.sh
+sh format-disk.1.sh
diff --git a/virtual-machines/single-vm/parameters/linux/single-vm-v2.json b/virtual-machines/single-vm/parameters/linux/single-vm-v2.json
@@ -52,8 +52,8 @@
             "namePrefix": "ra-single-linux",
             "computerNamePrefix": "web",
             "size": "Standard_DS1_v2",
-            "adminUsername": "",
-            "sshPublicKey":"",
+            "adminUsername": "testUser",
+            "adminPassword": "sdf45F$TGRD",
             "virtualNetwork": {
               "name": "ra-single-linux-vm-vnet"
             },
@@ -85,7 +85,7 @@
                   "autoUpgradeMinorVersion": true,
                   "settings": {
                     "fileUris": [
-                      "https://raw.githubusercontent.com/mspnp/reference-architectures/master/scripts/linux/format-disk.sh",
+                      "https://raw.githubusercontent.com/woodp/reference-architectures/woodp/single-vm-linux/virtual-machines/single-vm/extensions/linux/format-disk.sh",
                       "https://raw.githubusercontent.com/mspnp/reference-architectures/master/scripts/linux/install-apache.sh",
                       "https://raw.githubusercontent.com/mspnp/reference-architectures/master/virtual-machines/single-vm/extensions/linux/single-vm.sh"
                     ]