diff options
8 files changed, 73 insertions, 309 deletions
diff --git a/patches/opnfv-fuel/0000-reclass-baremetal-openstack-Fix-eth-assignment.patch b/patches/opnfv-fuel/0000-reclass-baremetal-openstack-Fix-eth-assignment.patch deleted file mode 100644 index 4a2a9434..00000000 --- a/patches/opnfv-fuel/0000-reclass-baremetal-openstack-Fix-eth-assignment.patch +++ /dev/null @@ -1,146 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Mon, 21 Aug 2017 22:26:09 +0200 -Subject: [PATCH] reclass: baremetal: openstack: Fix eth assignment - -Baremetal support introduced a couple of VCP VMs, which have 2 -network interfaces: -- primary (ens3 inside x86 VM) - connected to "br-mgmt" bridge on - each kvm node, serves for MaaS DHCP / connection to salt master; -- secondary (ens4 inside x86 VM) - connected to "br-ctl" bridge on - each kvm node, serves for Openstack Management network; - -However, the reclass model was configured to use a single IP address -on the primary interface, breaking the connnection to salt master, -while also not connecting the Openstack Management network properly. - -Fix this by configuring the primary interface for DHCP, while the -secondary gets a static IP in Openstack Management network. - -Change-Id: I9f1d6f080e882bfaae7b5f209bc3c5536826ba06 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 5 +++-- - .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml | 3 ++- - .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 5 +++-- - .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml | 5 +++-- - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 5 +++-- - .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 5 +++-- - 6 files changed, 17 insertions(+), 11 deletions(-) - -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 995c50c..20b470d 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: ens3 -+ keepalived_vip_interface: ens4 - keepalived_vip_virtual_router_id: 50 - cluster_vip_address: ${_param:openstack_control_address} - cluster_local_address: ${_param:single_address} -@@ -37,7 +37,8 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_single_interface} -+ ens3: ${_param:linux_dhcp_interface} -+ ens4: ${_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 b7ed814..522719a 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,4 +7,5 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_single_interface} -+ ens3: ${_param:linux_dhcp_interface} -+ ens4: ${_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 c0e21aa..8aa8b70 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: ens3 -+ keepalived_vip_interface: ens4 - keepalived_vip_virtual_router_id: 80 - galera_server_cluster_name: openstack_cluster - cluster_vip_address: ${_param:openstack_database_address} -@@ -30,4 +30,5 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_single_interface} -+ ens3: ${_param:linux_dhcp_interface} -+ ens4: ${_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 3b79030..0840cc4 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: ens3 -+ keepalived_vip_interface: ens4 - keepalived_vip_virtual_router_id: 90 - cluster_vip_address: ${_param:openstack_message_queue_address} - cluster_local_address: ${_param:single_address} -@@ -20,4 +20,5 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_single_interface} -+ ens3: ${_param:linux_dhcp_interface} -+ ens4: ${_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 2695c96..86f331d 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: ens3 -+ keepalived_vip_interface: ens4 - keepalived_vip_virtual_router_id: 240 - nginx_proxy_ssl: - enabled: true -@@ -27,7 +27,8 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_single_interface} -+ ens3: ${_param:linux_dhcp_interface} -+ ens4: ${_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 ca655dd..b46319f 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: ens3 -+ keepalived_vip_interface: ens4 - keepalived_vip_virtual_router_id: 230 - cluster_vip_address: ${_param:openstack_telemetry_address} - cluster_local_address: ${_param:single_address} -@@ -23,4 +23,5 @@ parameters: - linux: - network: - interface: -- ens3: ${_param:linux_single_interface} -+ ens3: ${_param:linux_dhcp_interface} -+ ens4: ${_param:linux_single_interface} diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch index 58607cd1..7bc8baa8 100644 --- a/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -36,10 +36,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/vgabios.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 0c01617..99d923b 100755 +index 52a9b77..9a27a39 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -48,6 +48,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" +@@ -51,6 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch b/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch index 5fd456ba..045c22d0 100644 --- a/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch +++ b/patches/opnfv-fuel/0009-classes-baremetal-AArch64-virtio-NIC-names-sync.patch @@ -20,23 +20,23 @@ is used). Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - .../baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++-- - .../cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 18 ++++++++++++------ - .../cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 8 ++++---- - .../baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 18 +++++++++--------- - .../baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 6 +++--- - .../baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml | 4 ++-- - .../baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 6 +++--- - .../openstack/message_queue.yml | 6 +++--- - .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 +++--- - .../baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 6 +++--- - 10 files changed, 44 insertions(+), 38 deletions(-) + .../baremetal-mcp-ocata-ovs-ha/infra/config.yml | 4 ++-- + .../baremetal-mcp-ocata-ovs-ha/infra/kvm.yml | 18 ++++++++++++------ + .../baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 8 ++++---- + .../openstack/compute.yml | 21 ++++++++++----------- + .../openstack/control.yml | 6 +++--- + .../openstack/dashboard.yml | 4 ++-- + .../openstack/database.yml | 6 +++--- + .../openstack/message_queue.yml | 6 +++--- + .../baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 6 +++--- + .../openstack/telemetry.yml | 6 +++--- + 10 files changed, 45 insertions(+), 40 deletions(-) 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 77443de..824b979 100644 +index ce2c951..7d95ebc 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: +@@ -32,8 +32,8 @@ parameters: linux: network: interface: @@ -125,21 +125,22 @@ index d193469..73215ee 100644 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -index 18a7a0b..d052e23 100644 +index 070ab78..e932f0d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -@@ -19,8 +19,8 @@ parameters: +@@ -19,9 +19,8 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - tenant_nic: enp7s0 +- external_nic: enp8s0 + mgmt_nic: eth0 + tenant_nic: eth1 linux_system_codename: xenial - linux: - network: -@@ -43,19 +43,19 @@ parameters: + interface_mtu: 1500 + keepalived_vip_interface: br-ctl +@@ -53,19 +52,19 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: @@ -165,21 +166,32 @@ index 18a7a0b..d052e23 100644 use_interfaces: - ${_param:tenant_nic} br-ctl: -@@ -65,4 +65,4 @@ parameters: +@@ -75,7 +74,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.300 + - ${_param:tenant_nic}.2183 + br-floating: + enabled: true + type: ovs_bridge +@@ -92,6 +91,6 @@ parameters: + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: +- - ${_param:external_nic} ++ - ${_param:tenant_nic} + use_ovs_ports: + - float-to-ex 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 20b470d..5ba1411 100644 +index 6f47f8a..5ba1411 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_interface: enp2s0 keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} @@ -188,34 +200,34 @@ index 20b470d..5ba1411 100644 linux: network: interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} +- ens2: ${_param:linux_dhcp_interface} +- ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_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 522719a..18f622c 100644 +index 39cc073..18f622c 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} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_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 8aa8b70..7a6934b 100644 +index dabda49..7a6934b 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_interface: enp2s0 keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster @@ -224,19 +236,19 @@ index 8aa8b70..7a6934b 100644 linux: network: interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} +- ens2: ${_param:linux_dhcp_interface} +- ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_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 0840cc4..f510a7b 100644 +index 881644b..f510a7b 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_interface: enp2s0 keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} @@ -245,19 +257,19 @@ index 0840cc4..f510a7b 100644 linux: network: interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} +- ens2: ${_param:linux_dhcp_interface} +- ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_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 86f331d..4e25b78 100644 +index 2147741..4e25b78 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_interface: enp2s0 keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: @@ -266,22 +278,22 @@ index 86f331d..4e25b78 100644 linux: network: interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} +- ens2: ${_param:linux_dhcp_interface} +- ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_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 b46319f..6ad13ae 100644 +index 505ee7f..6ad13ae 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_interface: enp2s0 keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} @@ -290,7 +302,7 @@ index b46319f..6ad13ae 100644 linux: network: interface: -- ens3: ${_param:linux_dhcp_interface} -- ens4: ${_param:linux_single_interface} +- ens2: ${_param:linux_dhcp_interface} +- ens3: ${_param:linux_single_interface} + enp1s0: ${_param:linux_dhcp_interface} + enp2s0: ${_param:linux_single_interface} diff --git a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch index ab078c26..95e39265 100644 --- a/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch +++ b/patches/opnfv-fuel/0011-network-public-mgmt-Use-arm-pod3-POD-config.patch @@ -5,13 +5,12 @@ Subject: [PATCH] network: public, mgmt: Use arm-pod3 POD config Move MaaS IPs to x.y.z.2 (upstream Fuel uses x.y.z.3). Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -fi --- ci/deploy.sh | 2 +- mcp/config/states/maas | 2 +- - .../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 22 ++++----- - .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 56 +++++++++++----------- - 4 files changed, 41 insertions(+), 41 deletions(-) + .../baremetal-mcp-ocata-ovs-ha/infra/init.yml | 22 ++++---- + .../baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 60 +++++++++++----------- + 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index cf7b3b3..2b4e724 100755 @@ -27,7 +26,7 @@ index cf7b3b3..2b4e724 100755 # Variables below are disabled for now, to be re-introduced or removed later diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 99d923b..13a8263 100755 +index 9a27a39..f83f4a7 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -20,7 +20,7 @@ salt -C 'mas01*' state.apply linux.network.interface @@ -75,7 +74,7 @@ index 93e2de0..1d75356 100644 infra_maas_node01_hostname: mas01 infra_kvm_node01_hostname: kvm01 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml -index 4036be1..dce7fb7 100644 +index 9c2bc7b..90e0cf3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml @@ -3,9 +3,9 @@ parameters: @@ -128,7 +127,7 @@ index 4036be1..dce7fb7 100644 openstack_telemetry_hostname: mdb -@@ -36,18 +36,18 @@ parameters: +@@ -36,23 +36,23 @@ parameters: openstack_telemetry_node02_hostname: mdb02 openstack_telemetry_node03_hostname: mdb03 @@ -157,3 +156,10 @@ index 4036be1..dce7fb7 100644 openstack_compute_node01_tenant_address: 10.1.0.101 openstack_compute_node02_tenant_address: 10.1.0.102 openstack_compute_node03_tenant_address: 10.1.0.103 +- openstack_compute_node01_external_address: 172.30.10.2 +- openstack_compute_node02_external_address: 172.30.10.3 ++ openstack_compute_node01_external_address: 10.0.8.101 ++ openstack_compute_node02_external_address: 10.0.8.102 + + # openstack service hostnames + openstack_proxy_hostname: prx diff --git a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index f56cb68a..dda55e42 100644 --- a/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0015-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -21,10 +21,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index 13a8263..fef7a62 100755 +index f83f4a7..bc8d04f 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -48,7 +48,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" +@@ -51,7 +51,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'" salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp diff --git a/patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch b/patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch index 2f5c0c57..febf0943 100644 --- a/patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch +++ b/patches/opnfv-fuel/0017-mcp-salt-formulas-armband-AArch64-bootstrap.patch @@ -24,10 +24,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/files/cloud.py.diff diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index fef7a62..75da696 100755 +index bc8d04f..3cea11d 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas -@@ -43,6 +43,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all +@@ -46,6 +46,7 @@ salt -C '* and not cfg01* and not mas01*' saltutil.sync_all salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network diff --git a/patches/opnfv-fuel/0019-baremetal-HA-Standalone-openstack_ha-state.patch b/patches/opnfv-fuel/0019-baremetal-HA-Standalone-openstack_ha-state.patch deleted file mode 100644 index 04251fe1..00000000 --- a/patches/opnfv-fuel/0019-baremetal-HA-Standalone-openstack_ha-state.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 22 Aug 2017 00:07:39 +0200 -Subject: [PATCH] baremetal: HA: Standalone openstack_ha state - -Replicate all calls from "openstack" state to "openstack_ha", -while adjusting minor parameters for HA, based on [1]. - -TODO: cleanup extra logging, re-verify states - -[1] https://docs.mirantis.com/mcp/1.0/mcp-deployment-guide/\ - deploy-mcp-cluster-manually.html - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../scenario/baremetal/os-nosdn-nofeature-ha.yaml | 1 - - mcp/config/states/openstack_ha | 43 ++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 1 deletion(-) - -diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml -index 1118d28..3f78bea 100644 ---- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml -+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml -@@ -3,7 +3,6 @@ cluster: - states: - - maas - - openstack_ha -- - openstack - - neutron_compute - - networks - virtual: -diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 2932735..b2f8f62 100755 ---- a/mcp/config/states/openstack_ha -+++ b/mcp/config/states/openstack_ha -@@ -1,4 +1,5 @@ - salt -I 'keepalived:cluster' state.sls keepalived -b 1 -+salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address - - salt -I 'rabbitmq:server' state.sls rabbitmq # maybe twice - salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status" -@@ -10,3 +11,45 @@ salt -I 'glusterfs:server' cmd.run "gluster peer status; gluster volume status" - salt -I 'galera:master' state.sls galera - salt -I 'galera:slave' state.sls galera - salt -I 'galera:master' mysql.status | grep -A1 wsrep_cluster_size -+ -+# Similar to 'openstack' state -+ -+# salt -I 'rabbitmq:server' state.sls rabbitmq -+# salt -I 'rabbitmq:server' cmd.run "rabbitmqctl status" -+ -+# salt -I 'mysql:server' state.sls mysql -+ -+salt -I 'memcached:server' state.sls memcached -+ -+salt -I 'haproxy:proxy' state.sls haproxy -+salt -I 'haproxy:proxy' service.status haproxy -+salt -I 'haproxy:proxy' service.restart rsyslog -+ -+salt -I 'keystone:server' state.sls keystone.server -b 1 -+salt -I 'keystone:server' service.restart apache2 -+salt -I 'keystone:server' state.sls keystone.client -+salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" -+ -+salt -I 'glance:server' state.sls glance -b 1 -+salt -I 'glance:server' state.sls glusterfs.client -+salt -I 'keystone:server' state.sls keystone.server -+salt -I 'keystone:server' cmd.run ". /root/keystonercv3; glance image-list" -+ -+salt -I 'nova:controller' state.sls nova -b 1 -+salt -I 'keystone:server' cmd.run ". /root/keystonercv3; nova service-list" -+salt -I 'heat:server' state.sls heat -+ -+salt -I 'cinder:controller' state.sls cinder -b 1 -+salt -I 'keystone:server' cmd.run ". /root/keystonercv3; cinder list" -+salt -I 'cinder:volume' state.sls cinder -+ -+salt -I 'neutron:server' state.sls neutron -b 1 -+salt -I 'neutron:gateway' state.sls neutron -+salt -I 'keystone:server' cmd.run ". /root/keystonercv3; neutron agent-list" -+ -+salt -I 'nova:compute' state.sls nova -+ -+salt -I 'horizon:server' state.sls horizon -+salt -I 'nginx:server' state.sls nginx -+ -+salt -I 'nova:compute' state.sls armband diff --git a/patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch b/patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch deleted file mode 100644 index f34cce8c..00000000 --- a/patches/opnfv-fuel/0020-states-maas-Retry-applying-VCP-VMs-linux-state.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Tue, 22 Aug 2017 02:19:34 +0200 -Subject: [PATCH] states: maas: Retry applying VCP VMs linux state - -Running a heavy state like `linux` on all nodes (including VCP VMs) -might time out the first time on slower systems. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - mcp/config/states/maas | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mcp/config/states/maas b/mcp/config/states/maas -index f8ff67a..371688a 100755 ---- a/mcp/config/states/maas -+++ b/mcp/config/states/maas -@@ -71,4 +71,4 @@ done - - salt -C '* and not cfg01* and not mas01*' saltutil.sync_all - salt -C '* and not cfg01* and not mas01*' state.apply salt --salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -+wait_for "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp" |