diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-02 05:30:39 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-03 03:21:09 +0100 |
| commit | 28af31a03561d8dd97db5d6d4b155b5489e3b84d (patch) | |
| tree | cd0db364750452331a1ad6334700a27806e62639 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha | |
| parent | 0a66c256b73d596808ccfbb915b60abecedf5af7 (diff) | |
[baremetal] prx: Add management network VIP
Include `openstack_web_public_vip` class for setting up the
old VIP in the public network, use old class for mgmt VIP.
Also change the generic hostname 'prx' to point inside mgmt net.
Change-Id: Iff69394f16ede290d149a26b054a85371f00f8e0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 29c64b73f749364867be78a474410fe062eba99e)
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml | 3 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml index 49140f803..7f8467051 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml @@ -22,6 +22,7 @@ parameters: openstack_gateway_node03_hostname: gtw03 # openstack service addresses + openstack_proxy_control_address: ${_param:opnfv_openstack_proxy_control_address} openstack_proxy_node01_control_address: ${_param:opnfv_openstack_proxy_node01_control_address} openstack_proxy_node02_control_address: ${_param:opnfv_openstack_proxy_node02_control_address} openstack_proxy_address: ${_param:opnfv_openstack_proxy_address} @@ -198,7 +199,7 @@ parameters: network: host: prx: - address: ${_param:openstack_proxy_address} + address: ${_param:openstack_proxy_control_address} names: - ${_param:openstack_proxy_hostname} - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml index 98b3b4c81..2159522d1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml @@ -19,16 +19,20 @@ classes: - system.salt.minion.cert.proxy - system.sphinx.server.doc.reclass - service.keepalived.cluster.single + - system.keepalived.cluster.instance.openstack_web_public_vip parameters: _param: - keepalived_vip_interface: ${_param:single_nic} + cluster_vip_address: ${_param:openstack_proxy_address} + keepalived_openstack_web_public_vip_address: ${_param:cluster_vip_address} + keepalived_openstack_web_public_vip_interface: ${_param:single_nic} + keepalived_vip_address: ${_param:openstack_proxy_control_address} + keepalived_vip_interface: ${_param:control_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true authority: ${_param:salt_minion_ca_authority} engine: salt mode: secure - cluster_vip_address: ${_param:openstack_proxy_address} salt_minion_ca_host: cfg01.${_param:cluster_domain} linux: system: |