diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-10-31 16:02:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-31 16:02:15 +0000 |
| commit | 66041473fa5b1a539b8a1fd5b98cf2e94f9fbf49 (patch) | |
| tree | 46e470169d7fd362e0bc17ff5bb4dc9401d98fb4 | |
| parent | ea0dc215e397d81c97f0ea80532331cd14e8f121 (diff) | |
| parent | 68e93e7da71ebce7a60822219dc4191bdd2bd9cb (diff) | |
Merge "[submodule] Bump pharos git repo for pod changes" into stable/gambia
4 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} diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject 738497a53b80e3b770457b4160532274fd92438 +Subproject 9c0e6d81d2302cbbfa5860a846211ee5807a6d9 |