From ea64dc22ea171d45ae60aff682fcadf9d525889b Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 8 Sep 2017 23:03:56 +0200 Subject: states: Split virtual_control_plane from maas We should eventually also support baremetal deploys without a virtualized control plane (VCP), so decouple MaaS provisioning from VCP provisioning. While at it, move "wait_for" bash function from maas state to common library file, lib.sh. Change-Id: I32c33135655cb6aceae901a5f92b51265a8c84b4 Signed-off-by: Alexandru Avadanii (cherry picked from commit ebd7067904b36ae32566da63e433365948a1f973) --- mcp/config/states/openstack_ha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/config/states/openstack_ha') diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 78da80a3f..e11135f43 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -57,5 +57,5 @@ salt -I 'nginx:server' state.sls nginx clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \ pillar.get _param:cluster_vip_address | awk '{print $2; exit}') salt -C 'I@nginx:server and *01*' cp.push \ - /etc/ssl/certs/${clstr_vip_addr}-with-chain.crt upload_path='certs/os_cacert' -cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/certs/os_cacert + "/etc/ssl/certs/${clstr_vip_addr}-with-chain.crt" upload_path='certs/os_cacert' +cd /etc/ssl/certs && ln -sf /var/cache/salt/master/minions/prx01.*/files/certs/os_cacert -- cgit 1.2.3-korg