summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 05:27:51 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 18:07:02 +0200
commit6dcb09998dae3c3f2a55fc5169fe7dc9010f8a0f (patch)
tree394f07dd7ca78a48d81bf23193dd1df57dbb1d8c /patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch
parentaee088c436ff6bf3abb1b358aaaeb793c5cd7bdb (diff)
u/fuel: Bump & rebase for yamllint cleanup
Change-Id: I1144c523596feb64251f08375501cdb73a0d76f6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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.patch12
1 files changed, 6 insertions, 6 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 78b0524e..0e151af3 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
@@ -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 73e2da5..47bf28d 100644
+index 07fada6..fe0714d 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
-@@ -52,13 +52,13 @@ parameters:
+@@ -54,13 +54,13 @@ parameters:
params:
single_address: 172.16.10.105
tenant_address: 10.1.0.105
@@ -84,18 +84,18 @@ index 73e2da5..47bf28d 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 a14a711..055d98c 100644
+index 8ac2391..bdedfcb 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
-@@ -6,7 +6,7 @@ parameters:
+@@ -7,7 +7,7 @@ parameters:
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
- cluster_public_host: 10.16.0.101
+ cluster_public_host: 10.0.9.101
neutron_public_protocol: http
- neutron_control_dvr: False
- neutron_l3_ha: False
+ 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
--- a/mcp/scripts/net_public.xml