diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-16 01:11:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-16 01:11:12 +0000 |
| commit | 13b071a86f5c552be17f12ae90ae73b94c1dc741 (patch) | |
| tree | 73e1d786de5cbf3234e6e9bf5c153a2a820f87d7 /patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch | |
| parent | 40f2e0e9a211949b416bf28fab5ae736d199c93b (diff) | |
| parent | a4e42550c023bd746143ba323de2bcc61e758bbb (diff) | |
Merge "u/fuel: Bump & rebase for common reclass rework" into stable/euphrates
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 | 18 |
1 files changed, 9 insertions, 9 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 0e151af3..59ec3117 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 505153a..bd6e923 100755 +index 361e675..e49401c 100755 --- a/mcp/config/states/networks +++ b/mcp/config/states/networks -@@ -10,7 +10,7 @@ PUBLIC_NET=$(salt --out yaml 'cmp*' pillar.get _param:external_address | \ +@@ -16,7 +16,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 505153a..bd6e923 100755 salt 'ctl01*' cmd.run ". /root/keystonercv3; \ openstack compute service list; \ -@@ -21,6 +21,6 @@ salt 'ctl01*' cmd.run ". /root/keystonercv3; \ +@@ -27,6 +27,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; \ @@ -63,10 +63,10 @@ index 505153a..bd6e923 100755 + --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -index 07fada6..fe0714d 100644 +index 3c3d526..e114ec2 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -@@ -54,13 +54,13 @@ parameters: +@@ -61,13 +61,13 @@ parameters: params: single_address: 172.16.10.105 tenant_address: 10.1.0.105 @@ -84,10 +84,10 @@ index 07fada6..fe0714d 100644 - external_address: 10.16.0.110 + external_address: 10.0.9.110 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml -index 8ac2391..bdedfcb 100644 +index 4f1c557..3784b7e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml -@@ -7,7 +7,7 @@ parameters: +@@ -14,7 +14,7 @@ parameters: openstack_region: RegionOne admin_email: root@localhost cluster_public_protocol: http @@ -97,10 +97,10 @@ index 8ac2391..bdedfcb 100644 neutron_control_dvr: 'False' neutron_l3_ha: 'False' diff --git a/mcp/scripts/net_public.xml b/mcp/scripts/net_public.xml -index 61650d5..f455480 100644 +index d6df4aa..87f3146 100644 --- a/mcp/scripts/net_public.xml +++ b/mcp/scripts/net_public.xml -@@ -2,5 +2,5 @@ +@@ -10,5 +10,5 @@ <name>public</name> <bridge name="public"/> <forward mode="nat"/> |