diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-18 16:24:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-18 16:24:37 +0000 |
| commit | 8749d6cade0b3892ea57583ee54b3bf72bdd91f8 (patch) | |
| tree | 002fb62791e4b048670fcf96f073c142abe60158 /patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch | |
| parent | 41fd911de4f0c302f44c9a3af12aebc852dfffc8 (diff) | |
| parent | e68b725920bd313df0ca65a77b27c8de6a6e2937 (diff) | |
Merge "u/fuel: Bump & rebase for state break & retry"
Diffstat (limited to 'patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch index 59ec3117..2ebf8ffa 100644 --- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch @@ -41,10 +41,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mcp/config/states/networks b/mcp/config/states/networks -index 361e675..e49401c 100755 +index d4735ad..e566903 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks -@@ -16,7 +16,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ +@@ -18,7 +18,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}') @@ -53,7 +53,7 @@ index 361e675..e49401c 100755 salt 'ctl01*' cmd.run ". /root/keystonercv3; \ openstack compute service list; \ -@@ -27,6 +27,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \ +@@ -29,6 +29,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; \ |