aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 02:17:10 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 02:17:10 +0200
commitd07736d25fa29b1b45e00750568959bc00a2ee09 (patch)
tree6f55e505817d54c382d6353344977155a06b763f /patches/opnfv-fuel
parentad5e266b0e10252c3f7ba08dd81b79a322d2d1a6 (diff)
p/fuel: Fix hardcoded mgmt IP in os_cacert path
Change-Id: I55f5397fc84ce60c67dc23d01dd54111e0babe3d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
index 634ed49..da0840b 100644
--- a/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
+++ b/patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch
@@ -16,11 +16,12 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
ci/deploy.sh | 2 +-
mcp/config/states/maas | 2 +-
+ mcp/config/states/openstack_ha | 2 +-
.../baremetal-mcp-ocata-odl-ha/infra/init.yml | 22 ++++----
.../baremetal-mcp-ocata-odl-ha/openstack/init.yml | 62 +++++++++++-----------
.../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 22 ++++----
.../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 60 ++++++++++-----------
- 6 files changed, 85 insertions(+), 85 deletions(-)
+ 7 files changed, 86 insertions(+), 86 deletions(-)
diff --git a/ci/deploy.sh b/ci/deploy.sh
index f51ba5f..5582727 100755
@@ -48,6 +49,17 @@ index 2dd62f9..3731c31 100755
wait_for 10 "salt -C 'mas01*' state.apply maas.region"
+diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
+index 32b581f..0d33c81 100755
+--- a/mcp/config/states/openstack_ha
++++ b/mcp/config/states/openstack_ha
+@@ -46,5 +46,5 @@ salt -I 'nova:compute' state.sls armband
+ 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'
++salt -C 'I@nginx:server and *01*' cp.push /etc/ssl/certs/172.16.10.80-with-chain.crt upload_path='/os_cacert'
+ cd /etc/ssl/certs && ln -s /var/cache/salt/master/minions/prx01.*/files/os_cacert
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
index c5a999b..79a8e92 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml