aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-02 05:30:39 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-02 05:58:01 +0100
commit29c64b73f749364867be78a474410fe062eba99e (patch)
tree91fb9a9f6dcc9f9b8eb817e2d002eb17181487e2 /mcp/reclass/classes
parentbb3a642e783b59ae2decb3b73d91f5bfca3afaef (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>
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml8
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: