Merge "Generate a standalone stackrc"

elements/undercloud-install/os-apply-config/root/stackrc

@@ -2,7 +2,7 @@
 for key in $( set | awk '{FS="="}  /^OS_/ {print $1}' ); do unset $key ; done
 NOVA_VERSION=1.1
 export NOVA_VERSION
-OS_PASSWORD=$(sudo hiera admin_password)
+OS_PASSWORD={{admin_password}}
 export OS_PASSWORD
 OS_AUTH_TYPE=password
 export OS_AUTH_TYPE

templates/config.json.template

@@ -13,6 +13,7 @@
   "masquerade_networks": ["{{MASQUERADE_NETWORK}}"],
   "service_certificate": "{{UNDERCLOUD_SERVICE_CERTIFICATE}}",
   "public_host": "{{UNDERCLOUD_PUBLIC_HOST}}",
+  "admin_password": "{{UNDERCLOUD_ADMIN_PASSWORD}}",
   "neutron": {
     "dhcp_start": "{{DHCP_START}}",
     "dhcp_end": "{{DHCP_END}}",