diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
3 files changed, 9 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example index a2cdabbf3..3a70e5f83 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example @@ -31,6 +31,7 @@ parameters: opnfv_openstack_proxy_address: 172.30.10.103 opnfv_openstack_proxy_node01_address: 172.30.10.104 opnfv_openstack_proxy_node02_address: 172.30.10.105 + opnfv_openstack_proxy_control_address: 10.167.4.103 opnfv_openstack_proxy_node01_control_address: 10.167.4.104 opnfv_openstack_proxy_node02_control_address: 10.167.4.105 opnfv_openstack_control_address: 10.167.4.10 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml index 0d4c66682..8f4edefea 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml @@ -12,6 +12,7 @@ parameters: openstack_version: pike # 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} @@ -200,7 +201,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-pike-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml index 0add63965..f83590ced 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml @@ -17,16 +17,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: |