From: Michael Polenchuk Date: Wed, 30 Aug 2017 09:15:32 +0000 (+0400) Subject: Fix ssl cert upload path X-Git-Tag: opnfv-5.0.RC1~102^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F40681%2F1;p=fuel.git Fix ssl cert upload path JIRA: FUEL-274 Change-Id: I8e947009399a995474ed0088d56da04755d278df Signed-off-by: Michael Polenchuk --- 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 index 3cb783591..02926007d 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 3cb78359189257d125dbec215ac57ecbf335abc6 +Subproject commit 02926007d5db81e0358f63d7ae3c9c28eb17dd8c