From 131aef7c2cfea9e2bbb0be86c5534bd4feebbfbc Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 22 Aug 2017 11:49:42 +0400 Subject: Shift vcp nodes interfaces * shift vcp nodes interfaces since names started from ens2 * add extra salt sync before vcp start up * run rabbitmq state on 1st node beforehand then the rest Change-Id: Ic2c174c288a5e89f2f28c0d9aa573340190a61d3 Signed-off-by: Michael Polenchuk --- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++-- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 6 +++--- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml | 4 ++-- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 6 +++--- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml | 6 +++--- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 +++--- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) (limited to 'mcp/reclass/classes/cluster') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml index 77443deec..ebd348f7e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml @@ -33,8 +33,8 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} salt: master: accept_policy: open_mode diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 20b470ddb..6f47f8ad0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -23,7 +23,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - keepalived_vip_interface: ens4 + keepalived_vip_interface: ens3 keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -37,8 +37,8 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} bind: server: control: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml index 522719a1b..39cc073a6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml @@ -7,5 +7,5 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index 8aa8b70a6..dabda49dc 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml @@ -16,7 +16,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: - keepalived_vip_interface: ens4 + keepalived_vip_interface: ens3 keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster cluster_vip_address: ${_param:openstack_database_address} @@ -30,5 +30,5 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 0840cc452..881644bf4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -7,7 +7,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: - keepalived_vip_interface: ens4 + keepalived_vip_interface: ens3 keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index 86f331dc7..2147741f2 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -15,7 +15,7 @@ classes: # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens4 + keepalived_vip_interface: ens3 keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -27,8 +27,8 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index b46319ff7..505ee7ff6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml @@ -10,7 +10,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - keepalived_vip_interface: ens4 + keepalived_vip_interface: ens3 keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -23,5 +23,5 @@ parameters: linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + ens2: ${_param:linux_dhcp_interface} + ens3: ${_param:linux_single_interface} -- cgit 1.2.3-korg