update the cloudera-director-on-centos offering from 1.1.0 to 1.1.1

cloudera-director-on-centos/director-node-and-shared-resources.json

@@ -34,6 +34,7 @@
     }
   },
   "variables": {
+    "singleQuote": "'",
     "vmName": "[parameters('dnsNamePrefix')]",
     "nicName": "[concat(variables('vmName'), '-nic')]",
     "publicIPAddressName": "[concat(variables('vmName'), '-publicIP')]",
@@ -266,7 +267,7 @@
           ]
         },
         "protectedSettings":{
-          "commandToExecute": "[concat('sh initialize-director-server.sh \"', parameters('vmSpec').adminUsername, '\" \"', parameters('dnsNameSuffix'), '\" \"', parameters('networkSpec').directorServerIPAddress, '\" \"', parameters('vmSpec').dbUsername, '\" \"', parameters('vmSpec').dbPassword, '\" \"', parameters('userInfo').company, '\" \"', parameters('userInfo').emailAddress, '\" \"', parameters('userInfo').businessPhone, '\" \"', parameters('userInfo').firstName, '\" \"', parameters('userInfo').lastName, '\" \"', parameters('userInfo').jobRole, '\" \"', parameters('userInfo').jobFunction, '\" \"', parameters('clusterParameters').dirUsername, '\" \"', parameters('clusterParameters').dirPassword, '\"')]"
+          "commandToExecute": "[concat('sh initialize-director-server.sh ', variables('singleQuote'), parameters('vmSpec').adminUsername, variables('singleQuote'), ' ', variables('singleQuote'), parameters('dnsNameSuffix'), variables('singleQuote'), ' ', variables('singleQuote'), parameters('networkSpec').directorServerIPAddress, variables('singleQuote'), ' ', variables('singleQuote'), parameters('vmSpec').dbUsername, variables('singleQuote'), ' ', variables('singleQuote'), parameters('vmSpec').dbPassword, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').company, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').emailAddress, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').businessPhone, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').firstName, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').lastName, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').jobRole, variables('singleQuote'), ' ', variables('singleQuote'), parameters('userInfo').jobFunction, variables('singleQuote'), ' ', variables('singleQuote'), parameters('clusterParameters').dirUsername, variables('singleQuote'), ' ', variables('singleQuote'), parameters('clusterParameters').dirPassword, variables('singleQuote'))]"
         }
       }
     }

cloudera-director-on-centos/metadata.json

@@ -3,5 +3,5 @@
   "description": "This template deploys Cloudera Director, a MySQL server, and a BIND DNS server on a single VM.",
   "summary": "This template deploys Cloudera Director with DB server, DNS server on a single VM. Cloudera Director is the fastest, easiest way to manage the lifecycle of enterprise Apache Hadoop clusters on Azure. The Director VM includes a template for deploying CDH and Cloudera Manager, enabling you to run high-value big data workloads on Azure.",
   "githubUsername": "jasonbw",
-  "dateUpdated": "2016-12-13"
+  "dateUpdated": "2017-01-11"
 }

cloudera-director-on-centos/prepare-conf-launch-cluster.json

@@ -15,6 +15,9 @@
       "type":"secureObject"
     }
   },
+  "variables": {
+    "singleQuote": "'"
+  },
   "resources": [
     {
       "type": "Microsoft.Compute/virtualMachines/extensions",
@@ -34,7 +37,7 @@
           ]
         },
         "protectedSettings": {
-          "commandToExecute": "[concat('python prepare-director-conf.py --envName \"', parameters('clusterParameters').envName, '\" --region \"', parameters('clusterParameters').location, '\" --subId \"', parameters('clusterParameters').subId, '\" --tenantId \"', parameters('clusterParameters').tenantId, '\" --clientId \"', parameters('clusterParameters').clientId, '\" --clientSecret \"', parameters('clusterParameters').clientSecret, '\" --username \"', parameters('clusterParameters').adminUsername, '\" --keyFileName \"', parameters('clusterParameters').keyFileName, '\" --networkSecurityGroupResourceGroup \"', parameters('clusterParameters').networkSecurityGroupResourceGroup, '\" --networkSecurityGroup \"', parameters('clusterParameters').networkSecurityGroup, '\" --virtualNetworkResourceGroup \"', parameters('clusterParameters').virtualNetworkResourceGroup, '\" --virtualNetwork \"', parameters('clusterParameters').virtualNetwork, '\" --subnetName \"', parameters('clusterParameters').subnetName, '\" --computeResourceGroup \"', parameters('clusterParameters').computeResourceGroup, '\" --hostFqdnSuffix \"', parameters('clusterParameters').hostFqdnSuffix, '\" --dbHostOrIP \"', parameters('clusterParameters').dbAddress, '\" --dbUsername \"', parameters('clusterParameters').dbUsername, '\" --dbPassword \"', parameters('clusterParameters').dbPassword, '\" --masterType \"', parameters('clusterParameters').masterType, '\" --workerType \"', parameters('clusterParameters').workerType, '\" --edgeType \"', parameters('clusterParameters').edgeType, '\" --dirUsername \"', parameters('clusterParameters').dirUsername, '\" --dirPassword \"', parameters('clusterParameters').dirPassword, '\"')]"
+          "commandToExecute": "[concat('python prepare-director-conf.py --envName ', variables('singleQuote'), parameters('clusterParameters').envName, variables('singleQuote'), ' --region ', variables('singleQuote'), parameters('clusterParameters').location, variables('singleQuote'), ' --subId ', variables('singleQuote'), parameters('clusterParameters').subId, variables('singleQuote'), ' --tenantId ', variables('singleQuote'), parameters('clusterParameters').tenantId, variables('singleQuote'), ' --clientId ', variables('singleQuote'), parameters('clusterParameters').clientId, variables('singleQuote'), ' --clientSecret ', variables('singleQuote'), parameters('clusterParameters').clientSecret, variables('singleQuote'), ' --username ', variables('singleQuote'), parameters('clusterParameters').adminUsername, variables('singleQuote'), ' --keyFileName ', variables('singleQuote'), parameters('clusterParameters').keyFileName, variables('singleQuote'), ' --networkSecurityGroupResourceGroup ', variables('singleQuote'), parameters('clusterParameters').networkSecurityGroupResourceGroup, variables('singleQuote'), ' --networkSecurityGroup ', variables('singleQuote'), parameters('clusterParameters').networkSecurityGroup, variables('singleQuote'), ' --virtualNetworkResourceGroup ', variables('singleQuote'), parameters('clusterParameters').virtualNetworkResourceGroup, variables('singleQuote'), ' --virtualNetwork ', variables('singleQuote'), parameters('clusterParameters').virtualNetwork, variables('singleQuote'), ' --subnetName ', variables('singleQuote'), parameters('clusterParameters').subnetName, variables('singleQuote'), ' --computeResourceGroup ', variables('singleQuote'), parameters('clusterParameters').computeResourceGroup, variables('singleQuote'), ' --hostFqdnSuffix ', variables('singleQuote'), parameters('clusterParameters').hostFqdnSuffix, variables('singleQuote'), ' --dbHostOrIP ', variables('singleQuote'), parameters('clusterParameters').dbAddress, variables('singleQuote'), ' --dbUsername ', variables('singleQuote'), parameters('clusterParameters').dbUsername, variables('singleQuote'), ' --dbPassword ', variables('singleQuote'), parameters('clusterParameters').dbPassword, variables('singleQuote'), ' --masterType ', variables('singleQuote'), parameters('clusterParameters').masterType, variables('singleQuote'), ' --workerType ', variables('singleQuote'), parameters('clusterParameters').workerType, variables('singleQuote'), ' --edgeType ', variables('singleQuote'), parameters('clusterParameters').edgeType, variables('singleQuote'), ' --dirUsername ', variables('singleQuote'), parameters('clusterParameters').dirUsername, variables('singleQuote'), ' --dirPassword ', variables('singleQuote'), parameters('clusterParameters').dirPassword, variables('singleQuote'))]"
         }
       }
     }

cloudera-director-on-centos/scripts/prepare-director-conf.py

@@ -207,7 +207,7 @@ def prepareAndImportConf(options):
 
     logging.info('Importing config to Cloudera Director server ...')
 
-    command = "python setup-default.py --admin-username %s --admin-password %s %s" % (
+    command = "python setup-default.py --admin-username '%s' --admin-password '%s' '%s'" % (
         dirUsername, dirPassword, confLocation)
     execAndLog(command)