summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-30 13:15:32 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-08-30 13:17:17 +0400
commit83c32a4255ae5ec27b65ab9deb38dbcb79a49205 (patch)
tree4cdf8433af4fb48d6259941d0f5b77a74f29920e
parent7a38c0d5f2b544bea0b5bcf755747f1fd04e5814 (diff)
Fix ssl cert upload path
JIRA: FUEL-274 Change-Id: I8e947009399a995474ed0088d56da04755d278df Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rwxr-xr-xmcp/config/states/openstack_ha4
m---------mcp/reclass/classes/system0
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index cc4279c8f..fc1fed7e5 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -45,5 +45,5 @@ salt -I 'nova:compute' state.sls nova
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='/os_cacert'
-cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/os_cacert
+salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/10.167.4.80-with-chain.crt upload_path='certs/os_cacert'
+cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/certs/os_cacert
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 3cb78359189257d125dbec215ac57ecbf335abc
+Subproject 02926007d5db81e0358f63d7ae3c9c28eb17dd8