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/0005-network-public-Use-arm-virtual2-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/0005-network-public-Use-arm-virtual2-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch index fb678ce5..64bd7079 100644 --- a/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0005-network-public-Use-arm-virtual2-POD-config.patch @@ -37,10 +37,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mcp/config/states/networks b/mcp/config/states/networks -index 6f294ce..fced1eb 100755 +index 505153a..bd6e923 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks -@@ -9,7 +9,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ +@@ -10,7 +10,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ pillar.get _param:openstack_compute_node01_external_address | \ awk --re-interval '/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/{print $2; exit}') @@ -49,7 +49,7 @@ index 6f294ce..fced1eb 100755 salt 'ctl01*' cmd.run ". /root/keystonercv3; \ openstack compute service list; \ -@@ -20,6 +20,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \ +@@ -21,6 +21,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \ openstack network create --external --default --provider-network-type flat \ --provider-physical-network physnet1 floating_net" salt 'ctl01*' cmd.run ". /root/keystonercv3; \ |