diff options
| author |   Guillermo Herrero <guillermo.herrero@enea.com> | 2018-10-19 10:37:53 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-10-31 14:38:04 +0100 |
| commit | 68e93e7da71ebce7a60822219dc4191bdd2bd9cb (patch) | |
| tree | 46a0f234519daefd1ba63f6763bba2be8d348083 /mcp/reclass | |
| parent | d9988cc10efd379c2d53778c67f6b035f2719001 (diff) | |
[submodule] Bump pharos git repo for pod changes
stable/gambia specific changes:
- align reclass parameter naming after [1];
- include ODL public IP definition from [2], preparing for ODL BGPVPN
scenario integration;
[1] https://gerrit.opnfv.org/gerrit/#/c/63023/
[2] https://gerrit.opnfv.org/gerrit/#/c/63273/
Change-Id: I698d97f3dbf8cdbe7002c5e4b02ac1a51dacdbfb
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit ec817180eece7be6e161e4633e08f41ea94cb903)
Diffstat (limited to 'mcp/reclass')
3 files changed, 3 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index 7322378eb..462c42c98 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -113,7 +113,7 @@ parameters: # opendaylight options {%- if conf.MCP_VCP %} opendaylight_server_node01_hostname: odl01 - opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address} + opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_address} {%- else %} opendaylight_control_hostname: ${_param:openstack_control_node02_hostname} opendaylight_server_node01_hostname: ${_param:opendaylight_control_hostname} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml index e0c642a9f..64b2a16f9 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml @@ -13,4 +13,4 @@ classes: parameters: _param: - opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_single_address} + opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_address} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml index a3918b231..87c41b048 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml @@ -17,7 +17,7 @@ parameters: network: host: odl01: - address: ${_param:opnfv_opendaylight_server_node01_single_address} + address: ${_param:opnfv_opendaylight_server_node01_address} names: - odl01 - odl01.${_param:cluster_domain} |