diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-09-11 08:27:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 08:27:21 +0000 |
| commit | 130f9c3be9facc3cef551c6d7781b02260f4f335 (patch) | |
| tree | 979a0d81df14039ffcedc646f0b496132c842ac8 | |
| parent | afff6db2867d9d0ee19fb4a399799b80d91af993 (diff) | |
| parent | 65881204a20b82b1ba972f9a8b79720d9b15d5f7 (diff) | |
Merge "os_cacert: Parametrize VIP used in path by cp.push"
| -rwxr-xr-x | mcp/config/states/openstack_ha | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index b9db81729..8ca76e49f 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -54,5 +54,8 @@ salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon salt -I 'nginx:server' state.sls nginx -salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/10.167.4.80-with-chain.crt upload_path='certs/os_cacert' +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 |