diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-07 19:38:32 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-08 00:36:55 +0200 |
| commit | 688aa4d7d8d5c1b9ba8963f02a7b8c24b9ccad0c (patch) | |
| tree | 3130320852a91c9650c457b13a9707e359543a46 /patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch | |
| parent | acb3ce175744444de4d37d510a9aff8543f23a41 (diff) | |
u/fuel: Bump & rebase for ODL scenario rename
JIRA: FUEL-279
Change-Id: Iba38553873f511eaac1fe77cd5d1d4e990340e52
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch')
| -rw-r--r-- | patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch index 7904c25a..0097a574 100644 --- a/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0004-network-public-Use-arm-virtual2-POD-config.patch @@ -37,11 +37,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> mcp/config/states/networks | 6 +++--- .../classes/cluster/virtual-mcp-ocata-common/openstack_init.yml | 2 +- .../classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml | 6 +++--- - mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml | 6 +++--- .../classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml | 6 +++--- mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml | 6 +++--- mcp/scripts/net_public.xml | 2 +- - 7 files changed, 17 insertions(+), 17 deletions(-) + 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mcp/config/states/networks b/mcp/config/states/networks index 505153a..bd6e923 100755 @@ -102,30 +101,6 @@ index 2f8e94a..bc95642 100644 opendaylight_control_node01: classes: - cluster.${_param:cluster_name}.opendaylight.control -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -index 57c6cec..f519e22 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/infra/config.yml -@@ -51,16 +51,16 @@ parameters: - params: - single_address: 172.16.10.105 - tenant_address: 10.1.0.105 -- external_address: 10.16.0.105 -+ external_address: 10.0.9.105 - openstack_compute_node02: - params: - single_address: 172.16.10.106 - tenant_address: 10.1.0.106 -- external_address: 10.16.0.106 -+ external_address: 10.0.9.106 - openstack_gateway_node01: - params: - tenant_address: 10.1.0.110 -- external_address: 10.16.0.110 -+ external_address: 10.0.9.110 - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml index aec6cde..b69258f 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml |