ansibleController.devopsAsCodePassword

xebialabs-community · May 11, 2020 · c735ba8 · c735ba8
1 parent bcad35e
commit c735ba8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/resources/devops-as-code/apply.sh.ftl b/src/main/resources/devops-as-code/apply.sh.ftl
@@ -11,7 +11,9 @@
 -->
 cat ${yaml_file}
 
+
+echo "\n----"
 echo "/usr/local/bin/xl --xl-deploy-password ${ansibleController.devopsAsCodePassword} --xl-deploy-username ${ansibleController.devopsAsCodeUsername} --xl-deploy-url ${ansibleController.devopsAsCodeUrl} apply  -f ${yaml_file}"
-echo "\n"
+echo "---"
 
 /usr/local/bin/xl --xl-deploy-password ${ansibleController.devopsAsCodePassword} --xl-deploy-username ${ansibleController.devopsAsCodeUsername} --xl-deploy-url ${ansibleController.devopsAsCodeUrl} apply  -f ${yaml_file}
diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
@@ -27,7 +27,7 @@
         <property name="devopsAsCodeDirectory" required="false" default="/tmp/devops-as-code" category="devops-as-code"/>
         <property name="devopsAsCodeUrl" required="false" default="http://localhost:4537" category="devops-as-code"/>
         <property name="devopsAsCodeUsername" required="false" default="admin" category="devops-as-code"/>
-        <property name="devopsAsCodePassword" required="false" default="admin" category="devops-as-code" password="true"/>
+        <property name="devopsAsCodePassword" required="false" default="admin" category="devops-as-code" password="false"/>
         <property name="debug" category="Advanced" kind="boolean" default="false"/>
     </type>
 

diff --git a/src/main/resources/xl-rules.xml b/src/main/resources/xl-rules.xml
@@ -171,7 +171,7 @@
                     <yaml_file expression="true">
                         "{0}/{1}/tmp/digital.ai_xldeploy.yaml".format(deployed.container.host.ansibleController.devopsAsCodeDirectory, deployed.container.host.name)
                     </yaml_file>
-                    <ansibleController expression="true">deployed.container.host.ansibleController</ansibleController>
+                    <ansibleController expression="true">repositoryService.read(deployed.container.host.ansibleController.host.id)</ansibleController>
                 </freemarker-context>
             </os-script>