summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-07 13:19:13 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-07 13:19:13 +0000
commitb466cb8270ebf9515d6acbad4d4dcfe28af47dd6 (patch)
treebbba9dc0d30696c1ffecb8caa03f5e1f821e46dc
parent9b106457ce0cc0d4d03115ef94c3b386164ea051 (diff)
parent291d972bdd666d36e35f8bb3953b0da806ea0eea (diff)
Merge changes from topics 'baremetal-noha', 'move-maas-classes'
* changes: [noha] cinder: Align VG name with HA scenarios [reclass] Move system.single class to common [maas] Add reclass storage definitions for all [reclass] Move MaaS classes to common dir for NOHA
-rw-r--r--mcp/reclass/classes/cluster/.gitignore4
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2)2
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/lab_proxy_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2)0
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/maas_proxy.yml.j2 (renamed from mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml.j2)0
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j23
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml9
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-odl-noha/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml1
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml1
22 files changed, 31 insertions, 25 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore
index a7efc5744..78eb36c1c 100644
--- a/mcp/reclass/classes/cluster/.gitignore
+++ b/mcp/reclass/classes/cluster/.gitignore
@@ -3,9 +3,9 @@ all-mcp-arch-common/init.yml
all-mcp-arch-common/opnfv/init.yml
mcp*common-*/infra/config.yml
mcp-common-ha/infra/init.yml
-mcp-common-ha/infra/maas.yml
+all-mcp-arch-common/infra/maas.yml
mcp-common-ha/infra/kvm_novcp.yml
-mcp-common-ha/include/maas_proxy.yml
+all-mcp-arch-common/opnfv/maas_proxy.yml
mcp-common-ha/openstack_control.yml
mcp-common-ha/openstack_telemetry.yml
mcp*common-*/openstack_init.yml
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 495dfa27b..a12e15663 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
@@ -9,9 +9,11 @@
---
classes:
- service.git.client
- - system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.reclass.storage.salt
+{%- if nm.cluster.has_baremetal_nodes %}
+ - system.reclass.storage.system.infra_maas_single
+{%- endif %}
- system.salt.master.api
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
index b2d7cefad..d980c29d4 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/maas.yml.j2
@@ -12,7 +12,7 @@
classes:
- system.maas.region.single
- service.maas.cluster.single
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
- cluster.all-mcp-arch-common.opnfv.pod_config
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index 19475c717..987c5eb2c 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -7,6 +7,7 @@
##############################################################################
---
classes:
+ - system.linux.system.single
- cluster.all-mcp-arch-common.opnfv
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/lab_proxy_pdf.yml.j2
index 3f238d667..3f238d667 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/lab_proxy_pdf.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/maas_proxy.yml.j2
index 58ea46cad..58ea46cad 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/maas_proxy.yml.j2
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
index f6e0baa11..6bc508387 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml.j2
@@ -18,8 +18,7 @@ classes:
# - system.reclass.storage.system.stacklight_log_cluster
# - system.reclass.storage.system.stacklight_monitor_cluster
# - system.reclass.storage.system.stacklight_telemetry_cluster
- - system.reclass.storage.system.infra_maas_single
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
- cluster.all-mcp-arch-common.infra.config_pdf
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
index 931dd1bab..c518d381f 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.all-mcp-arch-common
# - cluster.mcp-common-ha.stacklight
# - cluster.mcp-common-ha.stacklight.client
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
index 868f324f6..62af0893a 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml
@@ -22,8 +22,8 @@ classes:
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- cluster.mcp-common-ha.infra.kvm_pdf
- - cluster.mcp-common-ha.include.maas_proxy
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.maas_proxy
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
parameters:
_param:
linux_system_codename: xenial
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 326956c8a..76573c0ea 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -19,8 +19,8 @@ classes:
- system.ceilometer.agent.polling.default
- service.barbican.client.cluster
- cluster.mcp-common-ha.openstack_compute_pdf
- - cluster.mcp-common-ha.include.maas_proxy
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.maas_proxy
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
parameters:
_param:
cluster_vip_address: ${_param:openstack_control_address}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 28d727eaa..33c74fda6 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -45,8 +45,8 @@ classes:
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
- cluster.mcp-common-ha.infra.kvm_pdf
- - cluster.mcp-common-ha.include.maas_proxy
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.maas_proxy
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
{%- endif %}
parameters:
_param:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2
index 3576acc2f..4fa959797 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2
@@ -9,8 +9,8 @@
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-common-ha.include.maas_proxy
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.maas_proxy
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
parameters:
_param:
pxe_admin_interface: ${_param:opnfv_vcp_vm_primary_interface}
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2
index 1fa22aa7f..05550a299 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2
@@ -10,8 +10,8 @@
---
{%- if conf.MCP_VCP %}
classes:
- - cluster.mcp-common-ha.include.maas_proxy
- - cluster.mcp-common-ha.include.lab_proxy_pdf
+ - cluster.all-mcp-arch-common.opnfv.maas_proxy
+ - cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
parameters:
_param:
pxe_admin_interface: ${_param:opnfv_vcp_vm_primary_interface}
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 a027113ae..5c9c16d6b 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -49,6 +49,10 @@ parameters:
host: ${_param:openstack_control_address}
cinder:
volume:
+ backend:
+ lvm-driver:
+ # Align system.cinder.volume.backend.lvm and MaaS data
+ volume_group: ${linux:storage:lvm:cinder-vg:name}
my_ip: ${_param:single_address}
database:
host: ${_param:cluster_local_address}
@@ -68,6 +72,11 @@ parameters:
fstype: nfs
device: ${_param:openstack_control_address}:/srv/nova/instances
linux:
+ storage:
+ lvm:
+ # Align with both system.cinder.volume.backend.lvm and MaaS data
+ cinder-vg:
+ name: vgroot
system:
kernel:
sysctl:
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
index c06643089..b5c40ef7b 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2
@@ -8,7 +8,7 @@
{%- import 'net_map.j2' as nm with context %}
---
classes:
- - cluster.mcp-common-ha.infra.maas
+ - cluster.all-mcp-arch-common.infra.maas
- cluster.mcp-odl-ha.infra
{%- if 'aarch64' not in nm.cluster.arch %}
parameters:
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
index a595bf0b5..e0c642a9f 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-odl-noha.infra
- cluster.mcp-odl-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml
index 72a451652..655c2a396 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml
@@ -7,5 +7,5 @@
##############################################################################
---
classes:
- - cluster.mcp-common-ha.infra.maas
+ - cluster.all-mcp-arch-common.infra.maas
- cluster.mcp-ovn-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
index d4b6d85b7..82f4632bd 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-ovn-noha.infra
- cluster.mcp-ovn-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml
index f3d605494..93fd6e7e5 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml
@@ -7,5 +7,5 @@
##############################################################################
---
classes:
- - cluster.mcp-common-ha.infra.maas
+ - cluster.all-mcp-arch-common.infra.maas
- cluster.mcp-ovs-dpdk-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
index 96e2c9425..35c3e7655 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-ovs-dpdk-noha.infra
- cluster.mcp-ovs-dpdk-noha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml
index c9102ea70..e666d007b 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml
@@ -7,5 +7,5 @@
##############################################################################
---
classes:
- - cluster.mcp-common-ha.infra.maas
+ - cluster.all-mcp-arch-common.infra.maas
- cluster.mcp-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
index a453af50b..24de77a24 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml
@@ -7,7 +7,6 @@
##############################################################################
---
classes:
- - system.linux.system.single
- cluster.mcp-common-noha.init_options
- cluster.mcp-ovs-noha.infra
- cluster.mcp-ovs-noha.openstack