Fix go-ethereum bootnode issue, remove diagscript VM extension

Azure · Jan 10, 2017 · 326f669 · 326f669
1 parent 5d156ec
commit 326f669
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 62 deletions.
diff --git a/ethereum-consortium-blockchain-network/nested/vmExtension.json b/ethereum-consortium-blockchain-network/nested/vmExtension.json
@@ -90,36 +90,6 @@
         }
       }
     },
-    {
-      "type": "Microsoft.Compute/virtualMachines/extensions",
-      "name": "[concat(parameters('txVMNamePrefix'), copyIndex(), '/diagscript')]",
-      "apiVersion": "[variables('apiVersionVirtualMachinesExtensions')]",
-      "location": "[parameters('location')]",
-      "copy": {
-        "name": "txNodesDiagLoop",
-        "count": "[parameters('numTXNodes')]"
-      },
-      "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "LinuxDiagnostic",
-        "typeHandlerVersion": "2.3",
-        "autoUpgradeMinorVersion": true,
-        "settings": {
-           "perfCfg":[
-              {
-                "query":"SELECT UsedMemory,AvailableMemory FROM SCX_MemoryStatisticalInformation","table":"Memory"
-              },
-              {
-                "query":"SELECT PercentIdleTime,PercentProcessorTime,PercentIOWaitTime FROM SCX_ProcessorStatisticalInformation WHERE IsAggregate = TRUE","table":"CPU"
-              }
-            ]
-        },
-        "protectedSettings": {
-          "storageAccountName": "[parameters('metricsStorageAcctName')]",
-          "storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('metricsStorageAcctName')), parameters('apiVersionStorageAccounts')).keys[0].value]"
-        }
-      }
-    },
     {
       "apiVersion": "[variables('apiVersionVirtualMachinesExtensions')]",
       "type": "Microsoft.Compute/virtualMachines/extensions",
@@ -143,36 +113,6 @@
           "commandToExecute": "[concat('/bin/bash configure-geth.sh \"', parameters('adminUsername'), '\" \"', parameters('ethereumAccountPsswd'), '\" \"', parameters('ethereumAccountPassphrase'), '\" \"', parameters('artifactsLocationURL'), '\" \"', parameters('ethereumNetworkID'), '\" \"', variables('maxPeers'), '\" \"', variables('mnNode'), '\" \"', parameters('gethIPCPort'), '\" \"', parameters('numBootNodes'), '\" \"', parameters('numMNNodes'), '\" \"', parameters('mnVMNamePrefix'), '\" \"', copyIndex(), '\"')]"
         }
       }
-    },
-    {
-      "type": "Microsoft.Compute/virtualMachines/extensions",
-      "name": "[concat(parameters('mnVMNamePrefix'), copyIndex(), '/diagscript')]",
-      "apiVersion": "[variables('apiVersionVirtualMachinesExtensions')]",
-      "location": "[parameters('location')]",
-      "copy": {
-        "name": "mnNodesDiagLoop",
-        "count": "[parameters('numMNNodes')]"
-      },
-      "properties": {
-        "publisher": "Microsoft.OSTCExtensions",
-        "type": "LinuxDiagnostic",
-        "typeHandlerVersion": "2.3",
-        "autoUpgradeMinorVersion": true,
-        "settings": {
-          "perfCfg":[
-             {
-               "query":"SELECT UsedMemory,AvailableMemory FROM SCX_MemoryStatisticalInformation","table":"Memory"
-             },
-             {
-               "query":"SELECT PercentIdleTime,PercentProcessorTime,PercentIOWaitTime FROM SCX_ProcessorStatisticalInformation WHERE IsAggregate = TRUE","table":"CPU"
-             }
-           ]
-        },
-        "protectedSettings": {
-          "storageAccountName": "[parameters('metricsStorageAcctName')]",
-          "storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('metricsStorageAcctName')), parameters('apiVersionStorageAccounts')).keys[0].value]"
-        }
-      }
     }
   ]
 }
diff --git a/ethereum-consortium-blockchain-network/scripts/configure-geth-azureuser.sh b/ethereum-consortium-blockchain-network/scripts/configure-geth-azureuser.sh
@@ -157,7 +157,7 @@ BOOTNODE_URLS="";
 for i in `seq 0 $(($NUM_BOOT_NODES - 1))`; do
 	BOOTNODE_URLS="${BOOTNODE_URLS}enode://${NODE_IDS[$i]}@#${MN_NODE_PREFIX}${i}#:${GETH_IPC_PORT}";
   if [ $i -lt $(($NUM_BOOT_NODES - 1)) ]; then
-  	BOOTNODE_URLS="${BOOTNODE_URLS},";
+  	BOOTNODE_URLS="${BOOTNODE_URLS} --bootnodes ";
   fi
 done
 
@@ -188,7 +188,7 @@ fi
 ##########################################
 # Setup rc.local for service start on boot
 ##########################################
-echo -e '#!/bin/bash' "\nsudo -u $AZUREUSER /bin/bash $HOMEDIR/start-private-blockchain.sh $GETH_CFG_FILE_PATH $PASSWD" | sudo tee /etc/rc.local 2>&1 1>/dev/null
+echo "sudo -u $AZUREUSER /bin/bash $HOMEDIR/start-private-blockchain.sh $GETH_CFG_FILE_PATH $PASSWD" | sudo tee /etc/rc.local 2>&1 1>/dev/null
 if [ $? -ne 0 ]; then
 	exit 1;
 fi