diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-08 23:03:56 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-14 01:14:54 +0000 |
| commit | ea64dc22ea171d45ae60aff682fcadf9d525889b (patch) | |
| tree | 4e098d0370f8b6fb43b4ecda31af6ce4642ef98f /mcp/config/states/openstack_ha | |
| parent | 139aacf390d38b60f4fe4fd618a0bcf6b54b35cf (diff) | |
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit ebd7067904b36ae32566da63e433365948a1f973)
Diffstat (limited to 'mcp/config/states/openstack_ha')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 4 |
1 files changed, 2 insertions, 2 deletions
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 |