aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-07-18 14:07:50 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-07-23 13:22:02 +0400
commite5d54bfdddc6b501e74a7d13be19e69724e20adb (patch)
tree73bd6737642550aedabc1e6812ae148282c37e13 /mcp/reclass
parentf06c752bd1f95df30efbe147a362e612a49e469f (diff)
Rectify control address on compute nodes
Change-Id: I5734431d54c0d0ad9fb337fc37ce3b31a3c58e0a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml3
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j230
4 files changed, 13 insertions, 23 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index c129a0a12..495dfa27b 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -48,7 +48,7 @@ parameters:
- cluster.${_param:cluster_name}.openstack.compute
params:
pxe_admin_address: {{ nm.net_admin | ipnet_hostaddr(admin) }}
- control_address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }}
+ single_address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }}
tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }}
external_address: {{ nm.net_public | ipnet_hostaddr(pub) }}
salt_master_host: ${_param:reclass_config_master}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index c7c6f2fab..7f1cb3a0b 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -23,7 +23,7 @@ classes:
parameters:
_param:
cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:control_address}
+ cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
cluster_node01_address: ${_param:openstack_control_node01_address}
cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
@@ -35,7 +35,6 @@ parameters:
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
linux_system_codename: xenial
- single_address: ${_param:control_address}
glusterfs_version: '3.13'
glusterfs:
client:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index 671f6eb07..bfa46ac5c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -21,7 +21,6 @@ parameters:
_param:
interface_mtu: 9000
linux_system_codename: xenial
- single_address: ${_param:control_address}
nova:
compute:
libvirt_service: libvirtd
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
index 6bd61a2d4..4f22d4fa2 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2
@@ -39,15 +39,22 @@ parameters:
external_interface:
enabled: true
name: ${_param:external_interface}
- mtu: ${_param:interface_mtu}
proto: manual
- type: eth
- gateway: ${_param:opnfv_net_public_gw}
- name_servers: {{ nm.dns_public }}
+ ovs_port_type: OVSPort
+ type: ovs_port
+ ovs_bridge: br-floating
+ bridge: br-floating
br-floating:
enabled: true
type: ovs_bridge
mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:external_address}
+ netmask: ${_param:opnfv_net_public_mask}
+ use_interfaces:
+ - ${_param:external_interface}
+ gateway: ${_param:opnfv_net_public_gw}
+ name_servers: {{ nm.dns_public }}
br-mgmt:
enabled: true
type: bridge
@@ -57,18 +64,3 @@ parameters:
mtu: ${_param:interface_mtu}
use_interfaces:
- ${_param:primary_interface}
- float-to-ex:
- enabled: true
- type: ovs_port
- mtu: ${_param:interface_mtu}
- bridge: br-floating
- br-ex:
- enabled: true
- type: bridge
- mtu: ${_param:interface_mtu}
- address: ${_param:external_address}
- netmask: ${_param:opnfv_net_public_mask}
- use_interfaces:
- - ${_param:external_interface}
- use_ovs_ports:
- - float-to-ex