diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-24 17:10:33 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-24 17:11:05 +0200 |
| commit | 8d0731eecbb4c7f78e23c8a7e93004da7593afbe (patch) | |
| tree | 3cd9b7079a159801ba072f4f26056bd09b6283b9 /patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch | |
| parent | aa6c72b42783a4226c07e0b7af37434f13dc8c64 (diff) | |
p/fuel: Rebase after MaaS retry got upstream
Change-Id: I321fcb4aa77ebcb4595a9468c2257fef8b9a8ed6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0010-network-public-mgmt-Use-arm-pod3-POD-config.patch | 8 |
1 files changed, 4 insertions, 4 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 beb90533..bbfaf5e3 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 @@ -13,7 +13,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index cf7b3b3..2b4e724 100755 +index f51ba5f..5582727 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -139,7 +139,7 @@ URI_REGEXP='(file|https?|ftp)://.*' @@ -26,17 +26,17 @@ index cf7b3b3..2b4e724 100755 # Variables below are disabled for now, to be re-introduced or removed later diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 85cee8c..46bad6f 100755 +index 1e14e5f..db0241b 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface +@@ -52,7 +52,7 @@ salt -C 'mas01*' state.apply linux.network.interface salt -C 'mas01*' state.apply maas.pxe_nat salt -C 'mas01*' state.apply maas.cluster salt -C 'cfg01*' cmd.run \ - "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.3}" + "route add -net 192.168.11.0/24 gw ${MAAS_IP:-192.168.10.2}" - wait_for "salt -C 'mas01*' state.apply maas.region" + wait_for 10 "salt -C 'mas01*' state.apply maas.region" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml index 93e2de0..1d75356 100644 |