aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-12 02:51:17 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 20:30:27 +0200
commita75af3d4c30af050dd15c0f875142f6328874fe4 (patch)
tree8525a35700873d3ccdeb30d6e997ab4c24e486d9 /mcp/reclass
parent089585ad5370109d4c2a476b94b0017153d7713d (diff)
reclass: baremetal: Factor out common code
While at it, add .yamllint file (copied from releng repo). Change-Id: I39630c0043fe2fd601510969c401e6cc9efbf69a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml136
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml101
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml162
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml126
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml95
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml84
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml11
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml35
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml296
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml23
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml39
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml32
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml131
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml98
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml152
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml125
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml91
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml82
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml34
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml302
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml22
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml38
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml31
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml127
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml96
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml160
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml125
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml91
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml82
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml34
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml305
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml22
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml39
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml31
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml135
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml98
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml161
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml125
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml89
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml83
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml34
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml292
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml22
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml39
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml31
55 files changed, 1218 insertions, 3343 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
new file mode 100644
index 000000000..56d227e9d
--- /dev/null
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml
@@ -0,0 +1,11 @@
+---
+parameters:
+ _param:
+ reclass_config_master: 10.20.0.2
+ opnfv_maas_mcp_address: 10.20.0.3
+
+ # These should be moved to pod_config.yml and read based on PDF admin net
+ opnfv_maas_pxe_network_address: 192.168.11.0
+ opnfv_maas_pxe_address: 192.168.11.3
+ opnfv_maas_pxe_start_address: 192.168.11.5
+ opnfv_maas_pxe_end_address: 192.168.11.250
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
new file mode 100644
index 000000000..495cdb626
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
@@ -0,0 +1,136 @@
+---
+classes:
+ - service.git.client
+ - system.linux.system.single
+ - system.linux.system.repo.mcp.salt
+ - system.linux.system.repo.saltstack.xenial
+ - system.salt.master.api
+ - system.salt.master.pkg
+ - system.salt.minion.ca.salt_master
+ - system.reclass.storage.salt
+ - system.reclass.storage.system.physical_control_cluster
+ - system.reclass.storage.system.openstack_control_cluster
+ - system.reclass.storage.system.openstack_proxy_cluster
+ - system.reclass.storage.system.openstack_database_cluster
+ - system.reclass.storage.system.openstack_message_queue_cluster
+ - system.reclass.storage.system.openstack_telemetry_cluster
+ # - 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
+parameters:
+ _param:
+ salt_master_base_environment: prd
+ reclass_data_repository: local
+ salt_master_environment_repository: "https://github.com/tcpcloud"
+ salt_master_environment_revision: master
+ single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
+ salt_master_host: ${_param:infra_config_deploy_address}
+ # yamllint disable rule:line-length
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ dhcp_nic: ${_param:opnfv_fn_vm_primary_interface}
+ single_nic: ${_param:opnfv_fn_vm_secondary_interface}
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
+ salt:
+ master:
+ accept_policy: open_mode
+ file_recv: true
+ reclass:
+ storage:
+ data_source:
+ engine: local
+ node:
+ infra_kvm_node01:
+ params:
+ keepalived_vip_priority: 100
+ linux_system_codename: xenial
+ infra_kvm_node02:
+ params:
+ keepalived_vip_priority: 101
+ linux_system_codename: xenial
+ infra_kvm_node03:
+ params:
+ keepalived_vip_priority: 102
+ linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node02:
+ params:
+ linux_system_codename: xenial
+ openstack_telemetry_node03:
+ params:
+ linux_system_codename: xenial
+ openstack_message_queue_node01:
+ params:
+ linux_system_codename: xenial
+ openstack_message_queue_node02:
+ params:
+ linux_system_codename: xenial
+ openstack_message_queue_node03:
+ params:
+ linux_system_codename: xenial
+ openstack_proxy_node01:
+ params:
+ linux_system_codename: xenial
+ openstack_proxy_node02:
+ params:
+ linux_system_codename: xenial
+ # stacklight_log_node01:
+ # classes:
+ # - system.elasticsearch.client.single
+ # stacklight_monitor_node01:
+ # classes:
+ # - system.grafana.client.single
+ # - system.kibana.client.single
+ openstack_control_node01:
+ classes:
+ - cluster.baremetal-mcp-ocata-common.openstack_control_init
+ params:
+ linux_system_codename: xenial
+ openstack_control_node02:
+ params:
+ linux_system_codename: xenial
+ openstack_control_node03:
+ params:
+ linux_system_codename: xenial
+ openstack_database_node01:
+ classes:
+ - cluster.${_param:cluster_name}.openstack.database_init
+ params:
+ linux_system_codename: xenial
+ openstack_database_node02:
+ params:
+ linux_system_codename: xenial
+ openstack_database_node03:
+ params:
+ linux_system_codename: xenial
+ openstack_compute_node01:
+ name: ${_param:openstack_compute_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.compute
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ control_address: ${_param:openstack_compute_node01_control_address}
+ single_address: ${_param:openstack_compute_node01_single_address}
+ tenant_address: ${_param:openstack_compute_node01_tenant_address}
+ external_address: ${_param:openstack_compute_node01_external_address}
+ openstack_compute_node02:
+ name: ${_param:openstack_compute_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.compute
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ control_address: ${_param:openstack_compute_node02_control_address}
+ single_address: ${_param:openstack_compute_node02_single_address}
+ tenant_address: ${_param:openstack_compute_node02_tenant_address}
+ external_address: ${_param:openstack_compute_node02_external_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
new file mode 100644
index 000000000..34b5268ae
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
@@ -0,0 +1,101 @@
+---
+classes:
+ - system.linux.system.single
+ - cluster.all-mcp-ocata-common
+ # - cluster.baremetal-mcp-ocata-common.stacklight
+ # - cluster.baremetal-mcp-ocata-common.stacklight.client
+parameters:
+ _param:
+ apt_mk_version: nightly
+ mcp_repo_version: 1.1
+ salt_version: 2016.11
+ cluster_domain: ${_param:cluster_name}.local
+ # stacklight_environment: ${_param:cluster_domain}
+ reclass_data_revision: master
+ cluster_public_host: ${_param:openstack_proxy_address}
+ infra_config_hostname: cfg01
+ infra_maas_database_password: opnfv_secret
+
+ # infra service addresses
+ infra_config_address: ${_param:opnfv_infra_config_address}
+ infra_config_deploy_address: ${_param:reclass_config_master}
+ infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
+ infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
+ infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
+ infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
+ infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}
+
+ infra_kvm_address: ${_param:opnfv_infra_kvm_address}
+ infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
+ infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
+ infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
+
+ infra_maas_node01_hostname: mas01
+ infra_kvm_node01_hostname: kvm01
+ infra_kvm_node02_hostname: kvm02
+ infra_kvm_node03_hostname: kvm03
+
+ ntp_strata_host1: 1.pool.ntp.org
+ ntp_strata_host2: 0.pool.ntp.org
+
+ # Interface definitions
+ reclass:
+ storage:
+ node:
+ name: default
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+ linux_dhcp_interface:
+ enabled: true
+ type: eth
+ proto: dhcp
+ name: ${_param:dhcp_nic}
+ linux_single_interface:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:single_nic}
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+
+ # yamllint disable-line rule:line-length
+ salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+ linux:
+ system:
+ user:
+ ubuntu:
+ enabled: true
+ sudo: true
+ home: /home/ubuntu
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg01
+ - cfg01.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ mas01:
+ address: ${_param:infra_maas_node01_address}
+ names:
+ - ${_param:infra_maas_node01_hostname}
+ - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
+ kvm01:
+ address: ${_param:infra_kvm_node01_address}
+ names:
+ - ${_param:infra_kvm_node01_hostname}
+ - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ kvm02:
+ address: ${_param:infra_kvm_node02_address}
+ names:
+ - ${_param:infra_kvm_node02_hostname}
+ - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ kvm03:
+ address: ${_param:infra_kvm_node03_address}
+ names:
+ - ${_param:infra_kvm_node03_hostname}
+ - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
new file mode 100644
index 000000000..b9c30f03b
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
@@ -0,0 +1,162 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - service.keepalived.cluster.single
+ - system.glusterfs.server.volume.glance
+ - system.glusterfs.server.volume.keystone
+ - system.glusterfs.server.cluster
+ - system.salt.control.virt
+ - system.salt.control.cluster.openstack_control_cluster
+ - system.salt.control.cluster.openstack_proxy_cluster
+ - system.salt.control.cluster.openstack_database_cluster
+ - system.salt.control.cluster.openstack_message_queue_cluster
+ - system.salt.control.cluster.openstack_telemetry_cluster
+ # - system.salt.control.cluster.stacklight_server_cluster
+ # - system.salt.control.cluster.stacklight_log_cluster
+ # - system.salt.control.cluster.stacklight_telemetry_cluster
+parameters:
+ _param:
+ linux_system_codename: xenial
+ cluster_vip_address: ${_param:infra_kvm_address}
+ cluster_node01_address: ${_param:infra_kvm_node01_address}
+ cluster_node02_address: ${_param:infra_kvm_node02_address}
+ cluster_node03_address: ${_param:infra_kvm_node03_address}
+ keepalived_vip_interface: br-ctl
+ keepalived_vip_virtual_router_id: 69
+ deploy_nic: ${_param:opnfv_baremetal_primary_nic}
+ salt:
+ control:
+ size: # RAM 4096,8192,16384,32768,65536
+ # Default production sizing
+ openstack.control:
+ cpu: 4
+ ram: 12288
+ disk_profile: small
+ net_profile: default
+ openstack.database:
+ cpu: 4
+ ram: 6144
+ disk_profile: large
+ net_profile: default
+ openstack.message_queue:
+ cpu: 4
+ ram: 2048
+ disk_profile: small
+ net_profile: default
+ openstack.telemetry:
+ cpu: 2
+ ram: 3072
+ disk_profile: xxlarge
+ net_profile: default
+ # stacklight.log:
+ # cpu: 2
+ # ram: 4096
+ # disk_profile: xxlarge
+ # net_profile: default
+ # stacklight.server:
+ # cpu: 2
+ # ram: 4096
+ # disk_profile: small
+ # net_profile: default
+ # stacklight.telemetry:
+ # cpu: 2
+ # ram: 4096
+ # disk_profile: xxlarge
+ # net_profile: default
+ openstack.proxy:
+ cpu: 2
+ ram: 2048
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ node:
+ mdb01:
+ image: ${_param:salt_control_xenial_image}
+ mdb02:
+ image: ${_param:salt_control_xenial_image}
+ mdb03:
+ image: ${_param:salt_control_xenial_image}
+ ctl01:
+ image: ${_param:salt_control_xenial_image}
+ ctl02:
+ image: ${_param:salt_control_xenial_image}
+ ctl03:
+ image: ${_param:salt_control_xenial_image}
+ dbs01:
+ image: ${_param:salt_control_xenial_image}
+ dbs02:
+ image: ${_param:salt_control_xenial_image}
+ dbs03:
+ image: ${_param:salt_control_xenial_image}
+ msg01:
+ image: ${_param:salt_control_xenial_image}
+ msg02:
+ image: ${_param:salt_control_xenial_image}
+ msg03:
+ image: ${_param:salt_control_xenial_image}
+ prx01:
+ image: ${_param:salt_control_xenial_image}
+ prx02:
+ image: ${_param:salt_control_xenial_image}
+ provider: kvm03.${_param:cluster_domain}
+ virt:
+ nic:
+ default:
+ eth1:
+ bridge: br-mgmt
+ model: virtio
+ eth0:
+ bridge: br-ctl
+ model: virtio
+ glusterfs:
+ server:
+ volumes:
+ nova_instances:
+ storage: /srv/glusterfs/nova_instances
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances
+ - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
+ - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
+ options:
+ cluster.readdir-optimize: 'On'
+ nfs.disable: 'On'
+ network.remote-dio: 'On'
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ linux:
+ network:
+ interface:
+ deploy:
+ enabled: true
+ type: eth
+ proto: manual
+ address: 0.0.0.0
+ netmask: 255.255.255.0
+ name: ${_param:deploy_nic}
+ noifupdown: true
+ br-mgmt:
+ enabled: true
+ proto: dhcp
+ type: bridge
+ name_servers: ${_param:opnfv_name_servers}
+ use_interfaces:
+ - ${_param:deploy_nic}
+ noifupdown: true
+ mgmt-vlan:
+ enabled: true
+ proto: manual
+ type: vlan
+ name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ use_interfaces:
+ - ${_param:deploy_nic}
+ br-ctl:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
new file mode 100644
index 000000000..65a5a897a
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
@@ -0,0 +1,126 @@
+---
+classes:
+ - system.maas.region.single
+ - service.maas.cluster.single
+parameters:
+ _param:
+ dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
+ primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+ pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface}
+ interface_mtu: 1500
+ # MaaS has issues using MTU > 1500 for PXE interface
+ pxe_interface_mtu: 1500
+ linux_system_codename: xenial
+ maas_admin_username: opnfv
+ maas_admin_password: opnfv_secret
+ maas_db_password: opnfv_secret
+ dns_server01: ${_param:opnfv_dns_server01}
+ single_address: ${_param:infra_maas_node01_deploy_address}
+ maas:
+ region:
+ salt_master_ip: ${_param:infra_config_deploy_address}
+ domain: ${_param:cluster_domain}
+ maas_config:
+ commissioning_distro_series: 'xenial'
+ default_distro_series: 'xenial'
+ default_osystem: 'ubuntu'
+ default_storage_layout: 'lvm'
+ disk_erase_with_secure_erase: false
+ dnssec_validation: 'no'
+ enable_third_party_drivers: true
+ network_discovery: 'enabled'
+ default_min_hwe_kernel: 'hwe-16.04'
+ subnets:
+ opnfv_maas_pxe:
+ name: ${_param:opnfv_maas_pxe_network_address}/24
+ cidr: ${_param:opnfv_maas_pxe_network_address}/24
+ gateway_ip: ${_param:single_address}
+ iprange:
+ start: ${_param:opnfv_maas_pxe_start_address}
+ end: ${_param:opnfv_maas_pxe_end_address}
+ type: dynamic
+ vlans:
+ untagged:
+ vid: 0
+ dhcp_on: true
+ primary_rack: ${_param:infra_maas_node01_hostname}
+ machines:
+ kvm01:
+ interface:
+ mac: ${_param:opnfv_maas_node01_interface_mac}
+ power_parameters:
+ power_address: ${_param:opnfv_maas_node01_power_address}
+ power_password: ${_param:opnfv_maas_node01_power_password}
+ power_type: ${_param:opnfv_maas_node01_power_type}
+ power_user: ${_param:opnfv_maas_node01_power_user}
+ architecture: ${_param:opnfv_maas_node01_architecture}
+ distro_series: xenial
+ hwe_kernel: hwe-16.04
+ kvm02:
+ interface:
+ mac: ${_param:opnfv_maas_node02_interface_mac}
+ power_parameters:
+ power_address: ${_param:opnfv_maas_node02_power_address}
+ power_password: ${_param:opnfv_maas_node02_power_password}
+ power_type: ${_param:opnfv_maas_node02_power_type}
+ power_user: ${_param:opnfv_maas_node02_power_user}
+ architecture: ${_param:opnfv_maas_node02_architecture}
+ distro_series: xenial
+ hwe_kernel: hwe-16.04
+ kvm03:
+ interface:
+ mac: ${_param:opnfv_maas_node03_interface_mac}
+ power_parameters:
+ power_address: ${_param:opnfv_maas_node03_power_address}
+ power_password: ${_param:opnfv_maas_node03_power_password}
+ power_type: ${_param:opnfv_maas_node03_power_type}
+ power_user: ${_param:opnfv_maas_node03_power_user}
+ architecture: ${_param:opnfv_maas_node03_architecture}
+ distro_series: xenial
+ hwe_kernel: hwe-16.04
+ cmp001:
+ interface:
+ mac: ${_param:opnfv_maas_node04_interface_mac}
+ power_parameters:
+ power_address: ${_param:opnfv_maas_node04_power_address}
+ power_password: ${_param:opnfv_maas_node04_power_password}
+ power_type: ${_param:opnfv_maas_node04_power_type}
+ power_user: ${_param:opnfv_maas_node04_power_user}
+ architecture: ${_param:opnfv_maas_node04_architecture}
+ distro_series: xenial
+ hwe_kernel: hwe-16.04
+ cmp002:
+ interface:
+ mac: ${_param:opnfv_maas_node05_interface_mac}
+ power_parameters:
+ power_address: ${_param:opnfv_maas_node05_power_address}
+ power_password: ${_param:opnfv_maas_node05_power_password}
+ power_type: ${_param:opnfv_maas_node05_power_type}
+ power_user: ${_param:opnfv_maas_node05_power_user}
+ architecture: ${_param:opnfv_maas_node05_architecture}
+ distro_series: xenial
+ hwe_kernel: hwe-16.04
+ linux:
+ network:
+ interface:
+ dhcp_interface:
+ enabled: true
+ name: ${_param:dhcp_interface}
+ type: eth
+ proto: dhcp
+ primary_interface:
+ enabled: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:infra_maas_node01_address}
+ netmask: 255.255.255.0
+ type: eth
+ pxe_interface:
+ enabled: true
+ name: ${_param:pxe_interface}
+ mtu: ${_param:pxe_interface_mtu}
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ type: eth
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml
new file mode 100644
index 000000000..a55e95ead
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_benchmark.yml
@@ -0,0 +1,10 @@
+---
+parameters:
+ _param:
+ dhcp_nic: eth0
+ single_nic: eth1
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
new file mode 100644
index 000000000..aeb2547bb
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
@@ -0,0 +1,95 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - system.linux.storage.loopback
+ - system.glusterfs.client.cluster
+ - system.nova.compute.cluster
+ - system.nova.compute.nfv.hugepages
+ - system.nova.compute.nfv.cpu_pinning
+ - system.neutron.gateway.cluster
+ - system.cinder.volume.single
+ - system.cinder.volume.backend.lvm
+ - system.ceilometer.agent.cluster
+parameters:
+ _param:
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:control_address}
+ cluster_node01_hostname: ctl01
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ctl02
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ctl03
+ cluster_node03_address: ${_param:openstack_control_node03_address}
+ nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+ mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
+ external_nic: ${_param:opnfv_baremetal_tertiary_nic}
+ interface_mtu: 1500
+ keepalived_vip_interface: br-ctl
+ keepalived_vip_virtual_router_id: 69
+ loopback_device_size: 20
+ linux_system_codename: xenial
+ glusterfs:
+ client:
+ volumes:
+ nova_instances:
+ path: /var/lib/nova/instances
+ server: ${_param:glusterfs_service_host}
+ user: nova
+ group: nova
+ # yamllint disable-line rule:line-length
+ opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
+ linux:
+ system:
+ kernel:
+ sysctl:
+ vm.dirty_ratio: 10
+ vm.dirty_background_ratio: 5
+ network:
+ bridge: openvswitch
+ interface:
+ mgmt_nic:
+ enabled: true
+ type: eth
+ proto: dhcp
+ name: ${_param:mgmt_nic}
+ external_nic:
+ enabled: true
+ name: ${_param:external_nic}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ mgmt-vlan:
+ enabled: true
+ proto: manual
+ type: vlan
+ name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+ use_interfaces:
+ - ${_param:mgmt_nic}
+ br-ctl:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+ br-floating:
+ enabled: true
+ type: ovs_bridge
+ mtu: ${_param:interface_mtu}
+ 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: 255.255.255.0
+ use_interfaces:
+ - ${_param:external_nic}
+ use_ovs_ports:
+ - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
new file mode 100644
index 000000000..df21a785d
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
@@ -0,0 +1,84 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - system.ceilometer.client
+ - system.memcached.server.single
+ - system.keystone.server.cluster
+ - system.keystone.server.wsgi
+ - system.glance.control.cluster
+ - system.nova.control.cluster
+ - system.cinder.control.cluster
+ - system.cinder.control.backend.lvm
+ - system.heat.server.cluster
+ - system.designate.server.cluster
+ - system.designate.server.backend.bind
+ - system.bind.server.single
+ - system.haproxy.proxy.listen.openstack.nova-placement
+ - system.haproxy.proxy.listen.openstack.glare
+ - system.glusterfs.client.cluster
+ - system.glusterfs.client.volume.glance
+ - system.glusterfs.client.volume.keystone
+parameters:
+ _param:
+ keepalived_vip_interface: ${_param:single_nic}
+ keepalived_vip_virtual_router_id: 50
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ctl01
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ctl02
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ctl03
+ cluster_node03_address: ${_param:openstack_control_node03_address}
+ nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
+ keystone:
+ server:
+ cacert: /etc/ssl/certs/mcp_os_cacert
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml
new file mode 100644
index 000000000..79c387940
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml
@@ -0,0 +1,10 @@
+---
+classes:
+ - system.keystone.client.single
+ - system.keystone.client.service.aodh
+ - system.keystone.client.service.ceilometer
+ - system.keystone.client.service.nova21
+ - system.keystone.client.service.nova-placement
+ - system.keystone.client.service.glare
+ - system.keystone.client.service.cinder3
+ - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
new file mode 100644
index 000000000..b4a0da6c8
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml
@@ -0,0 +1,11 @@
+---
+classes:
+ - system.horizon.server.single
+parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
new file mode 100644
index 000000000..6bd640dd4
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
@@ -0,0 +1,35 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - system.galera.server.cluster
+ - system.galera.server.database.aodh
+ - system.galera.server.database.ceilometer
+ - system.galera.server.database.cinder
+ - system.galera.server.database.designate
+ - system.galera.server.database.glance
+ - system.galera.server.database.grafana
+ - system.galera.server.database.heat
+ - system.galera.server.database.keystone
+ - system.galera.server.database.nova
+ - system.galera.server.database.neutron
+parameters:
+ _param:
+ keepalived_vip_interface: ${_param:single_nic}
+ keepalived_vip_virtual_router_id: 80
+ galera_server_cluster_name: openstack_cluster
+ galera_max_connections: 3072
+ galera_innodb_buffer_pool_size: 2048M
+ cluster_vip_address: ${_param:openstack_database_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: dbs01
+ cluster_node01_address: ${_param:openstack_database_node01_address}
+ cluster_node02_hostname: dbs02
+ cluster_node02_address: ${_param:openstack_database_node02_address}
+ cluster_node03_hostname: dbs03
+ cluster_node03_address: ${_param:openstack_database_node03_address}
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml
new file mode 100644
index 000000000..5dcb9c9e1
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml
@@ -0,0 +1,3 @@
+---
+classes:
+ - system.mysql.client.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
new file mode 100644
index 000000000..c72041c82
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
@@ -0,0 +1,296 @@
+---
+# yamllint disable rule:line-length
+parameters:
+ _param:
+
+ openstack_version: ocata
+
+ openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
+ openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
+ openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
+ openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+ openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
+ openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
+ openstack_gateway_node01_hostname: gtw01
+ openstack_gateway_node02_hostname: gtw02
+ openstack_gateway_node03_hostname: gtw03
+
+ # openstack service addresses
+ openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
+ openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
+ openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
+ openstack_control_address: ${_param:opnfv_openstack_control_address}
+ openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
+ openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
+ openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
+ openstack_database_address: ${_param:opnfv_openstack_database_address}
+ openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
+ openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
+ openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
+ openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
+ openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
+ openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
+ openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
+
+
+ openstack_telemetry_hostname: mdb
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+
+ openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
+ openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
+ openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
+ openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
+
+ # OpenStack Compute
+ openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
+ openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
+ openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
+ openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
+ openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
+ openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
+ openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
+ openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
+ openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
+ openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
+ openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
+
+ # openstack service hostnames
+ openstack_proxy_hostname: prx
+ openstack_proxy_node01_hostname: prx01
+ openstack_proxy_node02_hostname: prx02
+ openstack_control_hostname: ctl
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_database_hostname: dbs
+ openstack_database_node01_hostname: dbs01
+ openstack_database_node02_hostname: dbs02
+ openstack_database_node03_hostname: dbs03
+ openstack_message_queue_hostname: msg
+ openstack_message_queue_node01_hostname: msg01
+ openstack_message_queue_node02_hostname: msg02
+ openstack_message_queue_node03_hostname: msg03
+
+ # openstack compute
+ openstack_compute_node01_hostname: cmp001
+ openstack_compute_node02_hostname: cmp002
+
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ # Neutron osv/nodvr
+ neutron_control_dvr: 'False'
+ neutron_l3_ha: 'True'
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: 'False'
+ neutron_gateway_agent_mode: legacy
+ neutron_compute_dvr: 'False'
+ neutron_compute_agent_mode: legacy
+ neutron_compute_external_access: 'True'
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: opnfv_secret
+ galera_server_admin_password: opnfv_secret
+ rabbitmq_secret_key: opnfv_secret
+ rabbitmq_admin_password: opnfv_secret
+ rabbitmq_openstack_password: opnfv_secret
+ glance_version: ${_param:openstack_version}
+ glance_service_host: ${_param:openstack_control_address}
+ keystone_version: ${_param:openstack_version}
+ keystone_service_host: ${_param:openstack_control_address}
+ heat_version: ${_param:openstack_version}
+ heat_service_host: ${_param:openstack_control_address}
+ heat_domain_admin_password: opnfv_secret
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:openstack_control_address}
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:openstack_telemetry_address}
+ ceilometer_influxdb_password: opnfv_secret
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:openstack_control_address}
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:openstack_control_address}
+ glusterfs_service_host: ${_param:infra_kvm_address}
+ mysql_admin_user: root
+ mysql_admin_password: opnfv_secret
+ mysql_cinder_password: opnfv_secret
+ mysql_ceilometer_password: opnfv_secret
+ mysql_glance_password: opnfv_secret
+ mysql_grafana_password: opnfv_secret
+ mysql_heat_password: opnfv_secret
+ mysql_keystone_password: opnfv_secret
+ mysql_neutron_password: opnfv_secret
+ mysql_nova_password: opnfv_secret
+ mysql_aodh_password: opnfv_secret
+ mysql_designate_password: opnfv_secret
+ aodh_version: ${_param:openstack_version}
+ keystone_aodh_password: opnfv_secret
+ keystone_service_token: opnfv_secret
+ keystone_admin_password: opnfv_secret
+ keystone_ceilometer_password: opnfv_secret
+ keystone_cinder_password: opnfv_secret
+ keystone_glance_password: opnfv_secret
+ keystone_heat_password: opnfv_secret
+ keystone_keystone_password: opnfv_secret
+ keystone_neutron_password: opnfv_secret
+ keystone_nova_password: opnfv_secret
+ keystone_designate_password: opnfv_secret
+ ceilometer_secret_key: opnfv_secret
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:openstack_control_address}
+ horizon_identity_encryption: none
+ horizon_identity_version: 2
+ mongodb_server_replica_set: ceilometer
+ mongodb_ceilometer_password: opnfv_secret
+ mongodb_admin_password: opnfv_secret
+ mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ metadata_password: opnfv_secret
+ openstack_telemetry_keepalived_password: opnfv_secret
+ aodh_service_host: ${_param:openstack_telemetry_address}
+ designate_service_host: ${_param:openstack_control_address}
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ # Billing
+ # keystone_billometer_password: opnfv_secret
+ # keystone_billometer_address: ${_param:billometer_service_host}
+ # billometer_service_host: ${_param:openstack_billing_address}
+ # billometer_version: ${_param:openstack_version}
+ # billometer_secret_key: opnfv_secretpasswordpasswordpassword
+ # billometer_identity_password: ${_param:keystone_billometer_password}
+ # billometer_identity_host: ${_param:openstack_control_address}
+ # billometer_identity_token: ${_param:keystone_service_token}
+ linux:
+ network:
+ host:
+ prx:
+ address: ${_param:openstack_proxy_address}
+ names:
+ - ${_param:openstack_proxy_hostname}
+ - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+ prx01:
+ address: ${_param:openstack_proxy_node01_address}
+ names:
+ - ${_param:openstack_proxy_node01_hostname}
+ - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+ prx02:
+ address: ${_param:openstack_proxy_node02_address}
+ names:
+ - ${_param:openstack_proxy_node02_hostname}
+ - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
+ ctl:
+ address: ${_param:openstack_control_address}
+ names:
+ - ${_param:openstack_control_hostname}
+ - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ${_param:openstack_control_node01_hostname}
+ - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ${_param:openstack_control_node02_hostname}
+ - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:openstack_control_node03_address}
+ names:
+ - ${_param:openstack_control_node03_hostname}
+ - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+ msg:
+ address: ${_param:openstack_message_queue_address}
+ names:
+ - ${_param:openstack_message_queue_hostname}
+ - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
+ msg01:
+ address: ${_param:openstack_message_queue_node01_address}
+ names:
+ - ${_param:openstack_message_queue_node01_hostname}
+ - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
+ msg02:
+ address: ${_param:openstack_message_queue_node02_address}
+ names:
+ - ${_param:openstack_message_queue_node02_hostname}
+ - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
+ msg03:
+ address: ${_param:openstack_message_queue_node03_address}
+ names:
+ - ${_param:openstack_message_queue_node03_hostname}
+ - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
+ dbs:
+ address: ${_param:openstack_database_address}
+ names:
+ - ${_param:openstack_database_hostname}
+ - ${_param:openstack_database_hostname}.${_param:cluster_domain}
+ dbs01:
+ address: ${_param:openstack_database_node01_address}
+ names:
+ - ${_param:openstack_database_node01_hostname}
+ - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
+ dbs02:
+ address: ${_param:openstack_database_node02_address}
+ names:
+ - ${_param:openstack_database_node02_hostname}
+ - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
+ dbs03:
+ address: ${_param:openstack_database_node03_address}
+ names:
+ - ${_param:openstack_database_node03_hostname}
+ - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
+ mdb:
+ address: ${_param:openstack_telemetry_address}
+ names:
+ - ${_param:openstack_telemetry_hostname}
+ - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
+ mdb01:
+ address: ${_param:openstack_telemetry_node01_address}
+ names:
+ - ${_param:openstack_telemetry_node01_hostname}
+ - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
+ mdb02:
+ address: ${_param:openstack_telemetry_node02_address}
+ names:
+ - ${_param:openstack_telemetry_node02_hostname}
+ - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
+ mdb03:
+ address: ${_param:openstack_telemetry_node03_address}
+ names:
+ - ${_param:openstack_telemetry_node03_hostname}
+ - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
+ cmp001:
+ address: ${_param:openstack_compute_node01_control_address}
+ names:
+ - ${_param:openstack_compute_node01_hostname}
+ - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+ cmp002:
+ address: ${_param:openstack_compute_node02_control_address}
+ names:
+ - ${_param:openstack_compute_node02_hostname}
+ - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
new file mode 100644
index 000000000..721380859
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
@@ -0,0 +1,23 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - system.rabbitmq.server.cluster
+ - system.rabbitmq.server.vhost.openstack
+parameters:
+ _param:
+ keepalived_vip_interface: ${_param:single_nic}
+ keepalived_vip_virtual_router_id: 90
+ cluster_vip_address: ${_param:openstack_message_queue_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: msg01
+ cluster_node01_address: ${_param:openstack_message_queue_node01_address}
+ cluster_node02_hostname: msg02
+ cluster_node02_address: ${_param:openstack_message_queue_node02_address}
+ cluster_node03_hostname: msg03
+ cluster_node03_address: ${_param:openstack_message_queue_node03_address}
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
new file mode 100644
index 000000000..b8051f629
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -0,0 +1,39 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - system.nginx.server.single
+ - system.nginx.server.proxy.openstack_api
+ - system.nginx.server.proxy.openstack_vnc
+ - system.nginx.server.proxy.openstack_web
+ - system.nginx.server.proxy.openstack.aodh
+ - system.nginx.server.proxy.openstack.ceilometer
+ - system.horizon.server.single
+ - system.salt.minion.cert.proxy
+ - system.sphinx.server.doc.reclass
+ - service.keepalived.cluster.single
+parameters:
+ _param:
+ keepalived_vip_interface: ${_param:single_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:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
+ system:
+ package:
+ libapache2-mod-wsgi:
+ salt:
+ minion:
+ cert:
+ proxy:
+ alternative_names: "IP:${_param:openstack_proxy_address}"
+ key_usage: 'digitalSignature, keyEncipherment'
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
new file mode 100644
index 000000000..d886cc5e0
--- /dev/null
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
@@ -0,0 +1,32 @@
+---
+classes:
+ - system.linux.system.repo.mcp.openstack
+ - system.linux.system.repo.mcp.extra
+ - system.mongodb.server.cluster
+ - system.mongodb.server.database.ceilometer
+ - system.ceilometer.server.backend.mongodb
+ # - system.ceilometer.server.backend.influxdb
+ # - system.heka.ceilometer_collector.single
+ - system.ceilometer.server.cluster
+ - system.aodh.server.cluster
+parameters:
+ _param:
+ keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
+ keepalived_vip_virtual_router_id: 230
+ cluster_vip_address: ${_param:openstack_telemetry_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: mdb01
+ cluster_node01_address: ${_param:openstack_telemetry_node01_address}
+ cluster_node02_hostname: mdb02
+ cluster_node02_address: ${_param:openstack_telemetry_node02_address}
+ cluster_node03_hostname: mdb03
+ cluster_node03_address: ${_param:openstack_telemetry_node03_address}
+ linux:
+ network:
+ interface:
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
+ mongodb:
+ server:
+ logging:
+ verbose: v
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
index 33f2804e0..83cf065a1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
@@ -1,141 +1,12 @@
---
classes:
- - service.git.client
- - system.linux.system.single
- - system.linux.system.repo.mcp.salt
- - system.linux.system.repo.saltstack.xenial
- - system.salt.master.api
- - system.salt.master.pkg
- - system.salt.minion.ca.salt_master
- - system.reclass.storage.salt
- - system.reclass.storage.system.physical_control_cluster
- - system.reclass.storage.system.openstack_control_cluster
- - system.reclass.storage.system.openstack_proxy_cluster
- - system.reclass.storage.system.openstack_database_cluster
- - system.reclass.storage.system.openstack_message_queue_cluster
- system.reclass.storage.system.opendaylight_control_single
- - system.reclass.storage.system.openstack_telemetry_cluster
- # - 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.baremetal-mcp-ocata-odl-ha.infra
+ - cluster.baremetal-mcp-ocata-common.infra.config
parameters:
- _param:
- salt_master_base_environment: prd
- reclass_data_repository: local
- salt_master_environment_repository: "https://github.com/tcpcloud"
- salt_master_environment_revision: master
- single_address: ${_param:infra_config_address}
- deploy_address: ${_param:infra_config_deploy_address}
- salt_master_host: ${_param:infra_config_deploy_address}
- # yamllint disable rule:line-length
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- dhcp_nic: ${_param:opnfv_fn_vm_primary_interface}
- single_nic: ${_param:opnfv_fn_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- salt:
- master:
- accept_policy: open_mode
- file_recv: true
reclass:
storage:
- data_source:
- engine: local
node:
- infra_kvm_node01:
- params:
- keepalived_vip_priority: 100
- linux_system_codename: xenial
- infra_kvm_node02:
- params:
- keepalived_vip_priority: 101
- linux_system_codename: xenial
- infra_kvm_node03:
- params:
- keepalived_vip_priority: 102
- linux_system_codename: xenial
- openstack_telemetry_node01:
- params:
- linux_system_codename: xenial
- openstack_telemetry_node02:
- params:
- linux_system_codename: xenial
- openstack_telemetry_node03:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node01:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node02:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node03:
- params:
- linux_system_codename: xenial
- openstack_proxy_node01:
- params:
- linux_system_codename: xenial
- openstack_proxy_node02:
- params:
- linux_system_codename: xenial
- # stacklight_log_node01:
- # classes:
- # - system.elasticsearch.client.single
- # stacklight_monitor_node01:
- # classes:
- # - system.grafana.client.single
- # - system.kibana.client.single
- openstack_control_node01:
- classes:
- - cluster.${_param:cluster_name}.openstack.control_init
- params:
- linux_system_codename: xenial
- openstack_control_node02:
- params:
- linux_system_codename: xenial
- openstack_control_node03:
- params:
- linux_system_codename: xenial
- openstack_database_node01:
- classes:
- - cluster.${_param:cluster_name}.openstack.database_init
- params:
- linux_system_codename: xenial
- openstack_database_node02:
- params:
- linux_system_codename: xenial
- openstack_database_node03:
- params:
- linux_system_codename: xenial
- openstack_compute_node01:
- name: ${_param:openstack_compute_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.compute
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- control_address: ${_param:openstack_compute_node01_control_address}
- single_address: ${_param:openstack_compute_node01_single_address}
- tenant_address: ${_param:openstack_compute_node01_tenant_address}
- external_address: ${_param:openstack_compute_node01_external_address}
- openstack_compute_node02:
- name: ${_param:openstack_compute_node02_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.compute
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- control_address: ${_param:openstack_compute_node02_control_address}
- single_address: ${_param:openstack_compute_node02_single_address}
- tenant_address: ${_param:openstack_compute_node02_tenant_address}
- external_address: ${_param:openstack_compute_node02_external_address}
opendaylight_control_node01:
classes:
- cluster.${_param:cluster_name}.opendaylight.control
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
index 4f8f87a2b..f17e95975 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
@@ -1,103 +1,7 @@
---
classes:
- - system.linux.system.single
- - cluster.all-mcp-ocata-common
- cluster.baremetal-mcp-ocata-odl-ha.openstack
- # - cluster.baremetal-mcp-ocata-odl-ha.stacklight
- # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client
+ - cluster.baremetal-mcp-ocata-common.infra
parameters:
_param:
- apt_mk_version: nightly
- mcp_repo_version: 1.1
- salt_version: 2016.11
cluster_name: baremetal-mcp-ocata-odl-ha
- cluster_domain: ${_param:cluster_name}.local
- # stacklight_environment: ${_param:cluster_domain}
- reclass_data_revision: master
- cluster_public_host: ${_param:openstack_proxy_address}
- infra_config_hostname: cfg01
- infra_maas_database_password: opnfv_secret
-
- # infra service addresses
- infra_config_address: ${_param:opnfv_infra_config_address}
- infra_config_deploy_address: ${_param:reclass_config_master}
- infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
- infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
- infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
- infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
- infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}
-
- infra_kvm_address: ${_param:opnfv_infra_kvm_address}
- infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
- infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
- infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
-
- infra_maas_node01_hostname: mas01
- infra_kvm_node01_hostname: kvm01
- infra_kvm_node02_hostname: kvm02
- infra_kvm_node03_hostname: kvm03
-
- ntp_strata_host1: 1.pool.ntp.org
- ntp_strata_host2: 0.pool.ntp.org
-
- # Interface definitions
- reclass:
- storage:
- node:
- name: default
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux_dhcp_interface:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:dhcp_nic}
- linux_single_interface:
- enabled: true
- type: eth
- proto: static
- name: ${_param:single_nic}
- address: ${_param:single_address}
- netmask: 255.255.255.0
-
- # yamllint disable-line rule:line-length
- salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
- linux:
- system:
- user:
- ubuntu:
- enabled: true
- sudo: true
- home: /home/ubuntu
- network:
- host:
- cfg01:
- address: ${_param:infra_config_address}
- names:
- - cfg01
- - cfg01.${_param:cluster_domain}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - ${_param:infra_config_hostname}
- - ${_param:infra_config_hostname}.${_param:cluster_domain}
- mas01:
- address: ${_param:infra_maas_node01_address}
- names:
- - ${_param:infra_maas_node01_hostname}
- - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
- kvm01:
- address: ${_param:infra_kvm_node01_address}
- names:
- - ${_param:infra_kvm_node01_hostname}
- - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
- kvm02:
- address: ${_param:infra_kvm_node02_address}
- names:
- - ${_param:infra_kvm_node02_hostname}
- - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
- kvm03:
- address: ${_param:infra_kvm_node03_address}
- names:
- - ${_param:infra_kvm_node03_hostname}
- - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index c9b3bc1e0..24a72e6ae 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -1,75 +1,12 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - service.keepalived.cluster.single
- - system.glusterfs.server.volume.glance
- - system.glusterfs.server.volume.keystone
- - system.glusterfs.server.cluster
- - system.salt.control.virt
- - system.salt.control.cluster.openstack_control_cluster
- - system.salt.control.cluster.openstack_proxy_cluster
- - system.salt.control.cluster.openstack_database_cluster
- - system.salt.control.cluster.openstack_message_queue_cluster
- - system.salt.control.cluster.openstack_telemetry_cluster
- # - system.salt.control.cluster.stacklight_server_cluster
- # - system.salt.control.cluster.stacklight_log_cluster
- # - system.salt.control.cluster.stacklight_telemetry_cluster
- cluster.baremetal-mcp-ocata-odl-ha.infra
+ - cluster.baremetal-mcp-ocata-common.infra.kvm
parameters:
- _param:
- linux_system_codename: xenial
- cluster_vip_address: ${_param:infra_kvm_address}
- cluster_node01_address: ${_param:infra_kvm_node01_address}
- cluster_node02_address: ${_param:infra_kvm_node02_address}
- cluster_node03_address: ${_param:infra_kvm_node03_address}
- keepalived_vip_interface: br-ctl
- keepalived_vip_virtual_router_id: 69
- deploy_nic: ${_param:opnfv_baremetal_primary_nic}
salt:
control:
size: # RAM 4096,8192,16384,32768,65536
# Default production sizing
- openstack.control:
- cpu: 4
- ram: 12288
- disk_profile: small
- net_profile: default
- openstack.database:
- cpu: 4
- ram: 6144
- disk_profile: large
- net_profile: default
- openstack.message_queue:
- cpu: 4
- ram: 2048
- disk_profile: small
- net_profile: default
- openstack.telemetry:
- cpu: 2
- ram: 3072
- disk_profile: xxlarge
- net_profile: default
- openstack.proxy:
- cpu: 2
- ram: 2048
- disk_profile: small
- net_profile: default
- # stacklight.log:
- # cpu: 2
- # ram: 4096
- # disk_profile: xxlarge
- # net_profile: default
- # stacklight.server:
- # cpu: 2
- # ram: 4096
- # disk_profile: small
- # net_profile: default
- # stacklight.telemetry:
- # cpu: 2
- # ram: 4096
- # disk_profile: xxlarge
- # net_profile: default
opendaylight.server:
cpu: 4
ram: 6144
@@ -84,90 +21,3 @@ parameters:
provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
image: ${_param:salt_control_xenial_image}
size: opendaylight.server
- mdb01:
- image: ${_param:salt_control_xenial_image}
- mdb02:
- image: ${_param:salt_control_xenial_image}
- mdb03:
- image: ${_param:salt_control_xenial_image}
- ctl01:
- image: ${_param:salt_control_xenial_image}
- ctl02:
- image: ${_param:salt_control_xenial_image}
- ctl03:
- image: ${_param:salt_control_xenial_image}
- dbs01:
- image: ${_param:salt_control_xenial_image}
- dbs02:
- image: ${_param:salt_control_xenial_image}
- dbs03:
- image: ${_param:salt_control_xenial_image}
- msg01:
- image: ${_param:salt_control_xenial_image}
- msg02:
- image: ${_param:salt_control_xenial_image}
- msg03:
- image: ${_param:salt_control_xenial_image}
- prx01:
- image: ${_param:salt_control_xenial_image}
- prx02:
- image: ${_param:salt_control_xenial_image}
- virt:
- nic:
- default:
- eth1:
- bridge: br-mgmt
- model: virtio
- eth0:
- bridge: br-ctl
- model: virtio
- glusterfs:
- server:
- volumes:
- nova_instances:
- storage: /srv/glusterfs/nova_instances
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances
- - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
- - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
- options:
- cluster.readdir-optimize: 'On'
- nfs.disable: 'On'
- network.remote-dio: 'On'
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
- linux:
- network:
- interface:
- deploy:
- enabled: true
- type: eth
- proto: manual
- address: 0.0.0.0
- netmask: 255.255.255.0
- name: ${_param:deploy_nic}
- noifupdown: true
- br-mgmt:
- enabled: true
- proto: dhcp
- type: bridge
- name_servers: ${_param:opnfv_name_servers}
- use_interfaces:
- - ${_param:deploy_nic}
- noifupdown: true
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:deploy_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
index 260da225d..f70ce70fd 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -1,127 +1,4 @@
---
classes:
- - system.maas.region.single
- - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-odl-ha.infra
-parameters:
- _param:
- dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
- primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
- pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface}
- interface_mtu: 1500
- # MaaS has issues using MTU > 1500 for PXE interface
- pxe_interface_mtu: 1500
- linux_system_codename: xenial
- maas_admin_username: opnfv
- maas_admin_password: opnfv_secret
- maas_db_password: opnfv_secret
- dns_server01: ${_param:opnfv_dns_server01}
- single_address: ${_param:infra_maas_node01_deploy_address}
- maas:
- region:
- salt_master_ip: ${_param:infra_config_deploy_address}
- domain: ${_param:cluster_domain}
- maas_config:
- commissioning_distro_series: 'xenial'
- default_distro_series: 'xenial'
- default_osystem: 'ubuntu'
- default_storage_layout: 'lvm'
- disk_erase_with_secure_erase: false
- dnssec_validation: 'no'
- enable_third_party_drivers: true
- network_discovery: 'enabled'
- default_min_hwe_kernel: 'hwe-16.04'
- subnets:
- opnfv_maas_pxe:
- name: ${_param:opnfv_maas_pxe_network_address}/24
- cidr: ${_param:opnfv_maas_pxe_network_address}/24
- gateway_ip: ${_param:single_address}
- iprange:
- start: ${_param:opnfv_maas_pxe_start_address}
- end: ${_param:opnfv_maas_pxe_end_address}
- type: dynamic
- vlans:
- untagged:
- vid: 0
- dhcp_on: true
- primary_rack: ${_param:infra_maas_node01_hostname}
- machines:
- kvm01:
- interface:
- mac: ${_param:opnfv_maas_node01_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node01_power_address}
- power_password: ${_param:opnfv_maas_node01_power_password}
- power_type: ${_param:opnfv_maas_node01_power_type}
- power_user: ${_param:opnfv_maas_node01_power_user}
- architecture: ${_param:opnfv_maas_node01_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm02:
- interface:
- mac: ${_param:opnfv_maas_node02_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node02_power_address}
- power_password: ${_param:opnfv_maas_node02_power_password}
- power_type: ${_param:opnfv_maas_node02_power_type}
- power_user: ${_param:opnfv_maas_node02_power_user}
- architecture: ${_param:opnfv_maas_node02_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm03:
- interface:
- mac: ${_param:opnfv_maas_node03_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node03_power_address}
- power_password: ${_param:opnfv_maas_node03_power_password}
- power_type: ${_param:opnfv_maas_node03_power_type}
- power_user: ${_param:opnfv_maas_node03_power_user}
- architecture: ${_param:opnfv_maas_node03_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp001:
- interface:
- mac: ${_param:opnfv_maas_node04_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node04_power_address}
- power_password: ${_param:opnfv_maas_node04_power_password}
- power_type: ${_param:opnfv_maas_node04_power_type}
- power_user: ${_param:opnfv_maas_node04_power_user}
- architecture: ${_param:opnfv_maas_node04_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp002:
- interface:
- mac: ${_param:opnfv_maas_node05_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node05_power_address}
- power_password: ${_param:opnfv_maas_node05_power_password}
- power_type: ${_param:opnfv_maas_node05_power_type}
- power_user: ${_param:opnfv_maas_node05_power_user}
- architecture: ${_param:opnfv_maas_node05_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- linux:
- network:
- interface:
- dhcp_interface:
- enabled: true
- name: ${_param:dhcp_interface}
- type: eth
- proto: dhcp
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:infra_maas_node01_address}
- netmask: 255.255.255.0
- type: eth
- pxe_interface:
- enabled: true
- name: ${_param:pxe_interface}
- mtu: ${_param:pxe_interface_mtu}
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- type: eth
+ - cluster.baremetal-mcp-ocata-common.infra.maas
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
index 758fa3ffc..51b62e3a1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
@@ -1,12 +1,4 @@
---
classes:
- cluster.baremetal-mcp-ocata-odl-ha
-parameters:
- _param:
- dhcp_nic: eth0
- single_nic: eth1
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_benchmark
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 032dd8452..590241e8d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -1,37 +1,11 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
- - system.nova.compute.nfv.hugepages
- - system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.opendaylight.single
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
- - system.cinder.volume.backend.lvm
- - system.ceilometer.agent.cluster
+ - cluster.baremetal-mcp-ocata-common.openstack_compute
- cluster.baremetal-mcp-ocata-odl-ha.infra
+ - system.neutron.gateway.opendaylight.single
parameters:
_param:
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:control_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
- external_nic: ${_param:opnfv_baremetal_tertiary_nic}
- interface_mtu: 1500
- keepalived_vip_interface: br-ctl
- keepalived_vip_virtual_router_id: 69
- loopback_device_size: 20
- linux_system_codename: xenial
neutron_agents:
- neutron-dhcp-agent
- neutron-metadata-agent
@@ -48,41 +22,14 @@ parameters:
services: ${_param:neutron_agents}
backend:
router: ${_param:opendaylight_router}
- glusterfs:
- client:
- volumes:
- nova_instances:
- path: /var/lib/nova/instances
- server: ${_param:glusterfs_service_host}
- user: nova
- group: nova
- # yamllint disable-line rule:line-length
- opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
- system:
- kernel:
- sysctl:
- vm.dirty_ratio: 10
- vm.dirty_background_ratio: 5
network:
- bridge: openvswitch
interface:
- mgmt_nic:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:mgmt_nic}
tenant_nic:
enabled: true
type: eth
proto: manual
name: ${_param:tenant_nic}
- external_nic:
- enabled: true
- name: ${_param:external_nic}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
br-mesh:
enabled: true
type: bridge
@@ -91,13 +38,6 @@ parameters:
mtu: 1500
use_interfaces:
- ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:mgmt_nic}
tenant-vlan:
enabled: true
proto: manual
@@ -105,30 +45,3 @@ parameters:
name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
use_interfaces:
- ${_param:tenant_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
- br-floating:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
- 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: 255.255.255.0
- use_interfaces:
- - ${_param:external_nic}
- use_ovs_ports:
- - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
index 9da1f03da..58806b993 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
@@ -1,90 +1,10 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.ceilometer.client
- - system.memcached.server.single
- - system.keystone.server.cluster
- - system.keystone.server.wsgi
- - system.glance.control.cluster
- system.neutron.control.opendaylight.cluster
- - system.nova.control.cluster
- - system.cinder.control.cluster
- - system.cinder.control.backend.lvm
- - system.heat.server.cluster
- - system.designate.server.cluster
- - system.designate.server.backend.bind
- - system.bind.server.single
- - system.haproxy.proxy.listen.openstack.nova-placement
- - system.haproxy.proxy.listen.openstack.glare
- - system.glusterfs.client.cluster
- - system.glusterfs.client.volume.glance
- - system.glusterfs.client.volume.keystone
- cluster.baremetal-mcp-ocata-odl-ha.infra
+ - cluster.baremetal-mcp-ocata-common.openstack_control
parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 50
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- keystone:
- server:
- cacert: /etc/ssl/certs/mcp_os_cacert
neutron:
server:
backend:
router: ${_param:opendaylight_router}
- bind:
- server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
- designate:
- server:
- pools:
- default:
- description: 'test pool'
- targets:
- default:
- description: 'test target1'
- default1:
- type: ${_param:designate_pool_target_type}
- description: 'test target2'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node02_address}
- port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- default2:
- type: ${_param:designate_pool_target_type}
- description: 'test target3'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node03_address}
- port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
index e70aab514..a1c00a131 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
@@ -1,12 +1,4 @@
---
classes:
- - system.horizon.server.single
- cluster.baremetal-mcp-ocata-odl-ha
-parameters:
- _param:
- horizon_site_branding: OpenStack Dashboard
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
index fc783d1b4..b833d3076 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
@@ -1,36 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.galera.server.cluster
- - system.galera.server.database.aodh
- - system.galera.server.database.ceilometer
- - system.galera.server.database.cinder
- - system.galera.server.database.designate
- - system.galera.server.database.glance
- - system.galera.server.database.grafana
- - system.galera.server.database.heat
- - system.galera.server.database.keystone
- - system.galera.server.database.nova
- - system.galera.server.database.neutron
- cluster.baremetal-mcp-ocata-odl-ha
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 80
- galera_server_cluster_name: openstack_cluster
- galera_max_connections: 3072
- galera_innodb_buffer_pool_size: 2048M
- cluster_vip_address: ${_param:openstack_database_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: dbs01
- cluster_node01_address: ${_param:openstack_database_node01_address}
- cluster_node02_hostname: dbs02
- cluster_node02_address: ${_param:openstack_database_node02_address}
- cluster_node03_hostname: dbs03
- cluster_node03_address: ${_param:openstack_database_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_database
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index c7df472d3..b3032b6a2 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
@@ -1,203 +1,20 @@
---
-# yamllint disable rule:line-length
+classes:
+ - cluster.baremetal-mcp-ocata-common.openstack_init
parameters:
_param:
-
- openstack_version: ocata
-
- openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
- openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
- openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
- openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
- openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
- openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
- openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node02_hostname: gtw02
- openstack_gateway_node03_hostname: gtw03
-
- # openstack service addresses
- openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
- openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
- openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
- openstack_control_address: ${_param:opnfv_openstack_control_address}
- openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
- openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
- openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
- openstack_database_address: ${_param:opnfv_openstack_database_address}
- openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
- openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
- openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
- openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
- openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
- openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
- openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
-
-
- openstack_telemetry_hostname: mdb
- openstack_telemetry_node01_hostname: mdb01
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_hostname: mdb03
-
- openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
- openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
- openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
- openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
-
- # OpenStack Compute
- openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
- openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
- openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
- openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
- openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
- openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
- openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
- openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
- openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
- openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
- openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
-
# opendaylight options
opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
opendaylight_server_node01_hostname: odl01
opendaylight_router: odl-router_v2
- # openstack service hostnames
- openstack_proxy_hostname: prx
- openstack_proxy_node01_hostname: prx01
- openstack_proxy_node02_hostname: prx02
- openstack_control_hostname: ctl
- openstack_control_node01_hostname: ctl01
- openstack_control_node02_hostname: ctl02
- openstack_control_node03_hostname: ctl03
- openstack_database_hostname: dbs
- openstack_database_node01_hostname: dbs01
- openstack_database_node02_hostname: dbs02
- openstack_database_node03_hostname: dbs03
- openstack_message_queue_hostname: msg
- openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_hostname: msg03
-
- # openstack compute
- openstack_compute_node01_hostname: cmp001
- openstack_compute_node02_hostname: cmp002
-
- openstack_region: RegionOne
- admin_email: root@localhost
- # Neutron osv/nodvr
- neutron_control_dvr: 'False'
neutron_tenant_network_types: "flat,vxlan"
- neutron_l3_ha: 'True'
- neutron_global_physnet_mtu: 1500
- neutron_external_mtu: 1500
- neutron_gateway_dvr: 'False'
- neutron_gateway_agent_mode: legacy
- neutron_compute_dvr: 'False'
- neutron_compute_agent_mode: legacy
- neutron_compute_external_access: 'True'
- galera_server_cluster_name: openstack_cluster
- galera_server_maintenance_password: opnfv_secret
- galera_server_admin_password: opnfv_secret
- rabbitmq_secret_key: opnfv_secret
- rabbitmq_admin_password: opnfv_secret
- rabbitmq_openstack_password: opnfv_secret
nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
compute_hugepages_size: 1G
compute_hugepages_count: 16
compute_hugepages_mount: /mnt/hugepages_1G
compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
- glance_version: ${_param:openstack_version}
- glance_service_host: ${_param:openstack_control_address}
- keystone_version: ${_param:openstack_version}
- keystone_service_host: ${_param:openstack_control_address}
- heat_version: ${_param:openstack_version}
- heat_service_host: ${_param:openstack_control_address}
- heat_domain_admin_password: opnfv_secret
- cinder_version: ${_param:openstack_version}
- cinder_service_host: ${_param:openstack_control_address}
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:openstack_telemetry_address}
- ceilometer_influxdb_password: opnfv_secret
- nova_version: ${_param:openstack_version}
- nova_service_host: ${_param:openstack_control_address}
- neutron_version: ${_param:openstack_version}
- neutron_service_host: ${_param:openstack_control_address}
- glusterfs_service_host: ${_param:infra_kvm_address}
- mysql_admin_user: root
- mysql_admin_password: opnfv_secret
- mysql_cinder_password: opnfv_secret
- mysql_ceilometer_password: opnfv_secret
- mysql_glance_password: opnfv_secret
- mysql_grafana_password: opnfv_secret
- mysql_heat_password: opnfv_secret
- mysql_keystone_password: opnfv_secret
- mysql_neutron_password: opnfv_secret
- mysql_nova_password: opnfv_secret
- mysql_aodh_password: opnfv_secret
- mysql_designate_password: opnfv_secret
- aodh_version: ${_param:openstack_version}
- keystone_aodh_password: opnfv_secret
- keystone_service_token: opnfv_secret
- keystone_admin_password: opnfv_secret
- keystone_ceilometer_password: opnfv_secret
- keystone_cinder_password: opnfv_secret
- keystone_glance_password: opnfv_secret
- keystone_heat_password: opnfv_secret
- keystone_keystone_password: opnfv_secret
- keystone_neutron_password: opnfv_secret
- keystone_nova_password: opnfv_secret
- keystone_designate_password: opnfv_secret
- ceilometer_secret_key: opnfv_secret
- horizon_version: ${_param:openstack_version}
- horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
- horizon_identity_host: ${_param:openstack_control_address}
- horizon_identity_encryption: none
- horizon_identity_version: 2
- mongodb_server_replica_set: ceilometer
- mongodb_ceilometer_password: opnfv_secret
- mongodb_admin_password: opnfv_secret
- mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
- metadata_password: opnfv_secret
- openstack_telemetry_keepalived_password: opnfv_secret
- aodh_service_host: ${_param:openstack_telemetry_address}
- designate_service_host: ${_param:openstack_control_address}
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- designate_pool_ns_records:
- - hostname: 'ns1.example.org.'
- priority: 10
- designate_pool_nameservers:
- - host: ${_param:openstack_control_node01_address}
- port: 53
- - host: ${_param:openstack_control_node02_address}
- port: 53
- - host: ${_param:openstack_control_node03_address}
- port: 53
- designate_pool_target_type: bind9
- designate_pool_target_masters:
- - host: ${_param:openstack_control_node01_address}
- port: 5354
- - host: ${_param:openstack_control_node02_address}
- port: 5354
- - host: ${_param:openstack_control_node03_address}
- port: 5354
- designate_pool_target_options:
- host: ${_param:openstack_control_node01_address}
- port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- designate_version: ${_param:openstack_version}
- # Billing
- # keystone_billometer_password: opnfv_secret
- # keystone_billometer_address: ${_param:billometer_service_host}
- # billometer_service_host: ${_param:openstack_billing_address}
- # billometer_version: ${_param:openstack_version}
- # billometer_secret_key: opnfv_secretpasswordpasswordpassword
- # billometer_identity_password: ${_param:keystone_billometer_password}
- # billometer_identity_host: ${_param:openstack_control_address}
- # billometer_identity_token: ${_param:keystone_service_token}
linux:
system:
repo:
@@ -213,121 +30,6 @@ parameters:
net.ipv4.tcp_fin_timeout: 30
network:
host:
- prx:
- address: ${_param:openstack_proxy_address}
- names:
- - ${_param:openstack_proxy_hostname}
- - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
- prx01:
- address: ${_param:openstack_proxy_node01_address}
- names:
- - ${_param:openstack_proxy_node01_hostname}
- - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
- prx02:
- address: ${_param:openstack_proxy_node02_address}
- names:
- - ${_param:openstack_proxy_node02_hostname}
- - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
- ctl:
- address: ${_param:openstack_control_address}
- names:
- - ${_param:openstack_control_hostname}
- - ${_param:openstack_control_hostname}.${_param:cluster_domain}
- ctl01:
- address: ${_param:openstack_control_node01_address}
- names:
- - ${_param:openstack_control_node01_hostname}
- - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
- ctl02:
- address: ${_param:openstack_control_node02_address}
- names:
- - ${_param:openstack_control_node02_hostname}
- - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
- ctl03:
- address: ${_param:openstack_control_node03_address}
- names:
- - ${_param:openstack_control_node03_hostname}
- - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
- msg:
- address: ${_param:openstack_message_queue_address}
- names:
- - ${_param:openstack_message_queue_hostname}
- - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
- msg01:
- address: ${_param:openstack_message_queue_node01_address}
- names:
- - ${_param:openstack_message_queue_node01_hostname}
- - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- msg02:
- address: ${_param:openstack_message_queue_node02_address}
- names:
- - ${_param:openstack_message_queue_node02_hostname}
- - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
- msg03:
- address: ${_param:openstack_message_queue_node03_address}
- names:
- - ${_param:openstack_message_queue_node03_hostname}
- - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
- dbs:
- address: ${_param:openstack_database_address}
- names:
- - ${_param:openstack_database_hostname}
- - ${_param:openstack_database_hostname}.${_param:cluster_domain}
- dbs01:
- address: ${_param:openstack_database_node01_address}
- names:
- - ${_param:openstack_database_node01_hostname}
- - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- dbs02:
- address: ${_param:openstack_database_node02_address}
- names:
- - ${_param:openstack_database_node02_hostname}
- - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
- dbs03:
- address: ${_param:openstack_database_node03_address}
- names:
- - ${_param:openstack_database_node03_hostname}
- - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
- mdb:
- address: ${_param:openstack_telemetry_address}
- names:
- - ${_param:openstack_telemetry_hostname}
- - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
- mdb01:
- address: ${_param:openstack_telemetry_node01_address}
- names:
- - ${_param:openstack_telemetry_node01_hostname}
- - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
- mdb02:
- address: ${_param:openstack_telemetry_node02_address}
- names:
- - ${_param:openstack_telemetry_node02_hostname}
- - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
- mdb03:
- address: ${_param:openstack_telemetry_node03_address}
- names:
- - ${_param:openstack_telemetry_node03_hostname}
- - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
- cmp001:
- address: ${_param:openstack_compute_node01_control_address}
- names:
- - ${_param:openstack_compute_node01_hostname}
- - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
- cmp002:
- address: ${_param:openstack_compute_node02_control_address}
- names:
- - ${_param:openstack_compute_node02_hostname}
- - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
- # gtw01:
- # address: ${_param:openstack_gateway_node01_address}
- # names:
- # - ${_param:openstack_gateway_node01_hostname}
- # - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
- # gtw02:
- # address: ${_param:openstack_gateway_node02_address}
- # names:
- # - ${_param:openstack_gateway_node02_hostname}
- # - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
odl01:
address: ${_param:opendaylight_service_host}
names:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
index f740e2904..afc00a777 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
@@ -1,24 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.rabbitmq.server.cluster
- - system.rabbitmq.server.vhost.openstack
- cluster.baremetal-mcp-ocata-odl-ha
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 90
- cluster_vip_address: ${_param:openstack_message_queue_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: msg01
- cluster_node01_address: ${_param:openstack_message_queue_node01_address}
- cluster_node02_hostname: msg02
- cluster_node02_address: ${_param:openstack_message_queue_node02_address}
- cluster_node03_hostname: msg03
- cluster_node03_address: ${_param:openstack_message_queue_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_message_queue
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 83a4be3fb..a5c3a24ae 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -1,45 +1,9 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.nginx.server.single
- - system.nginx.server.proxy.openstack_api
- - system.nginx.server.proxy.openstack_vnc
- - system.nginx.server.proxy.openstack_web
- - system.nginx.server.proxy.openstack.aodh
- - system.nginx.server.proxy.openstack.ceilometer
- - system.horizon.server.single
- - system.salt.minion.cert.proxy
- - system.sphinx.server.doc.reclass
- - service.keepalived.cluster.single
- cluster.baremetal-mcp-ocata-odl-ha.infra
- cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
- # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
+ - cluster.baremetal-mcp-ocata-common.openstack_proxy
parameters:
- _param:
- keepalived_vip_interface: ${_param:single_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:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- system:
- package:
- libapache2-mod-wsgi:
- salt:
- minion:
- cert:
- proxy:
- alternative_names: "IP:${_param:openstack_proxy_address}"
- key_usage: 'digitalSignature, keyEncipherment'
nginx:
server:
site:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 4b14f7beb..de3045357 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -1,33 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.mongodb.server.cluster
- - system.mongodb.server.database.ceilometer
- - system.ceilometer.server.backend.mongodb
- # - system.ceilometer.server.backend.influxdb
- # - system.heka.ceilometer_collector.single
- - system.ceilometer.server.cluster
- - system.aodh.server.cluster
- cluster.baremetal-mcp-ocata-odl-ha.infra
-parameters:
- _param:
- keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 230
- cluster_vip_address: ${_param:openstack_telemetry_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: mdb01
- cluster_node01_address: ${_param:openstack_telemetry_node01_address}
- cluster_node02_hostname: mdb02
- cluster_node02_address: ${_param:openstack_telemetry_node02_address}
- cluster_node03_hostname: mdb03
- cluster_node03_address: ${_param:openstack_telemetry_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- mongodb:
- server:
- logging:
- verbose: v
+ - cluster.baremetal-mcp-ocata-common.openstack_telemetry
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index cd7083040..a20dce487 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -1,141 +1,16 @@
---
classes:
- - service.git.client
- - system.linux.system.single
- - system.linux.system.repo.mcp.salt
- - system.linux.system.repo.saltstack.xenial
- - system.salt.master.api
- - system.salt.master.pkg
- - system.salt.minion.ca.salt_master
- - system.reclass.storage.salt
- - system.reclass.storage.system.physical_control_cluster
- - system.reclass.storage.system.openstack_control_cluster
- - system.reclass.storage.system.openstack_proxy_cluster
- - system.reclass.storage.system.openstack_database_cluster
- - system.reclass.storage.system.openstack_message_queue_cluster
- - system.reclass.storage.system.openstack_telemetry_cluster
- # - 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.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+ - cluster.baremetal-mcp-ocata-common.infra.config
parameters:
- _param:
- salt_master_base_environment: prd
- reclass_data_repository: local
- salt_master_environment_repository: "https://github.com/tcpcloud"
- salt_master_environment_revision: master
- single_address: ${_param:infra_config_address}
- deploy_address: ${_param:infra_config_deploy_address}
- salt_master_host: ${_param:infra_config_deploy_address}
- # yamllint disable rule:line-length
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- dhcp_nic: ${_param:opnfv_fn_vm_primary_interface}
- single_nic: ${_param:opnfv_fn_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- salt:
- master:
- accept_policy: open_mode
- file_recv: true
reclass:
storage:
- data_source:
- engine: local
node:
- infra_kvm_node01:
- params:
- keepalived_vip_priority: 100
- linux_system_codename: xenial
- infra_kvm_node02:
- params:
- keepalived_vip_priority: 101
- linux_system_codename: xenial
- infra_kvm_node03:
- params:
- keepalived_vip_priority: 102
- linux_system_codename: xenial
- openstack_telemetry_node01:
- params:
- linux_system_codename: xenial
- openstack_telemetry_node02:
- params:
- linux_system_codename: xenial
- openstack_telemetry_node03:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node01:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node02:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node03:
- params:
- linux_system_codename: xenial
- openstack_proxy_node01:
- params:
- linux_system_codename: xenial
- openstack_proxy_node02:
- params:
- linux_system_codename: xenial
- # stacklight_log_node01:
- # classes:
- # - system.elasticsearch.client.single
- # stacklight_monitor_node01:
- # classes:
- # - system.grafana.client.single
- # - system.kibana.client.single
- openstack_control_node01:
- classes:
- - cluster.${_param:cluster_name}.openstack.control_init
- params:
- linux_system_codename: xenial
- openstack_control_node02:
- params:
- linux_system_codename: xenial
- openstack_control_node03:
- params:
- linux_system_codename: xenial
- openstack_database_node01:
- classes:
- - cluster.${_param:cluster_name}.openstack.database_init
- params:
- linux_system_codename: xenial
- openstack_database_node02:
- params:
- linux_system_codename: xenial
- openstack_database_node03:
- params:
- linux_system_codename: xenial
openstack_compute_node01:
- name: ${_param:openstack_compute_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.compute
params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- control_address: ${_param:openstack_compute_node01_control_address}
- single_address: ${_param:openstack_compute_node01_single_address}
- tenant_address: ${_param:openstack_compute_node01_tenant_address}
- external_address: ${_param:openstack_compute_node01_external_address}
dpdk0_name: enp7s0
dpdk0_pci: '"0000:07:00.0"'
openstack_compute_node02:
- name: ${_param:openstack_compute_node02_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.compute
params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- control_address: ${_param:openstack_compute_node02_control_address}
- single_address: ${_param:openstack_compute_node02_single_address}
- tenant_address: ${_param:openstack_compute_node02_tenant_address}
- external_address: ${_param:openstack_compute_node02_external_address}
dpdk0_name: enp7s0
dpdk0_pci: '"0000:07:00.0"'
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
index f68d48452..49e89c641 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
@@ -1,106 +1,12 @@
---
classes:
- - system.linux.system.single
- - cluster.all-mcp-ocata-common
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
- # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight
- # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.client
+ - cluster.baremetal-mcp-ocata-common.infra
parameters:
_param:
- apt_mk_version: nightly
- mcp_repo_version: 1.1
- salt_version: 2016.11
cluster_name: baremetal-mcp-ocata-ovs-dpdk-ha
- cluster_domain: ${_param:cluster_name}.local
- # stacklight_environment: ${_param:cluster_domain}
- reclass_data_revision: master
- cluster_public_host: ${_param:openstack_proxy_address}
- infra_config_hostname: cfg01
- infra_maas_database_password: opnfv_secret
-
- # infra service addresses
- infra_config_address: ${_param:opnfv_infra_config_address}
- infra_config_deploy_address: ${_param:reclass_config_master}
- infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
- infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
- infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
- infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
- infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}
-
- infra_kvm_address: ${_param:opnfv_infra_kvm_address}
- infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
- infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
- infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
-
- infra_maas_node01_hostname: mas01
- infra_kvm_node01_hostname: kvm01
- infra_kvm_node02_hostname: kvm02
- infra_kvm_node03_hostname: kvm03
-
- ntp_strata_host1: 1.pool.ntp.org
- ntp_strata_host2: 0.pool.ntp.org
-
- # Interface definitions
- reclass:
- storage:
- node:
- name: default
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux_dhcp_interface:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:dhcp_nic}
- linux_single_interface:
- enabled: true
- type: eth
- proto: static
- name: ${_param:single_nic}
- address: ${_param:single_address}
- netmask: 255.255.255.0
-
- # yamllint disable-line rule:line-length
- salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
linux:
system:
- user:
- ubuntu:
- enabled: true
- sudo: true
- home: /home/ubuntu
service:
apt-daily.timer:
status: dead
- network:
- host:
- cfg01:
- address: ${_param:infra_config_address}
- names:
- - cfg01
- - cfg01.${_param:cluster_domain}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - ${_param:infra_config_hostname}
- - ${_param:infra_config_hostname}.${_param:cluster_domain}
- mas01:
- address: ${_param:infra_maas_node01_address}
- names:
- - ${_param:infra_maas_node01_hostname}
- - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
- kvm01:
- address: ${_param:infra_kvm_node01_address}
- names:
- - ${_param:infra_kvm_node01_hostname}
- - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
- kvm02:
- address: ${_param:infra_kvm_node02_address}
- names:
- - ${_param:infra_kvm_node02_hostname}
- - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
- kvm03:
- address: ${_param:infra_kvm_node03_address}
- names:
- - ${_param:infra_kvm_node03_hostname}
- - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index d5f2e92d1..5207988cd 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
@@ -1,162 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - service.keepalived.cluster.single
- - system.glusterfs.server.volume.glance
- - system.glusterfs.server.volume.keystone
- - system.glusterfs.server.cluster
- - system.salt.control.virt
- - system.salt.control.cluster.openstack_control_cluster
- - system.salt.control.cluster.openstack_proxy_cluster
- - system.salt.control.cluster.openstack_database_cluster
- - system.salt.control.cluster.openstack_message_queue_cluster
- - system.salt.control.cluster.openstack_telemetry_cluster
- # - system.salt.control.cluster.stacklight_server_cluster
- # - system.salt.control.cluster.stacklight_log_cluster
- # - system.salt.control.cluster.stacklight_telemetry_cluster
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-parameters:
- _param:
- linux_system_codename: xenial
- cluster_vip_address: ${_param:infra_kvm_address}
- cluster_node01_address: ${_param:infra_kvm_node01_address}
- cluster_node02_address: ${_param:infra_kvm_node02_address}
- cluster_node03_address: ${_param:infra_kvm_node03_address}
- keepalived_vip_interface: br-ctl
- keepalived_vip_virtual_router_id: 69
- deploy_nic: ${_param:opnfv_baremetal_primary_nic}
- salt:
- control:
- size: # RAM 4096,8192,16384,32768,65536
- # Default production sizing
- openstack.control:
- cpu: 4
- ram: 12288
- disk_profile: small
- net_profile: default
- openstack.database:
- cpu: 4
- ram: 6144
- disk_profile: large
- net_profile: default
- openstack.message_queue:
- cpu: 4
- ram: 2048
- disk_profile: small
- net_profile: default
- openstack.telemetry:
- cpu: 2
- ram: 3072
- disk_profile: xxlarge
- net_profile: default
- openstack.proxy:
- cpu: 2
- ram: 2048
- disk_profile: small
- net_profile: default
- # stacklight.log:
- # cpu: 2
- # ram: 4096
- # disk_profile: xxlarge
- # net_profile: default
- # stacklight.server:
- # cpu: 2
- # ram: 4096
- # disk_profile: small
- # net_profile: default
- # stacklight.telemetry:
- # cpu: 2
- # ram: 4096
- # disk_profile: xxlarge
- # net_profile: default
- cluster:
- internal:
- node:
- mdb01:
- image: ${_param:salt_control_xenial_image}
- mdb02:
- image: ${_param:salt_control_xenial_image}
- mdb03:
- image: ${_param:salt_control_xenial_image}
- ctl01:
- image: ${_param:salt_control_xenial_image}
- ctl02:
- image: ${_param:salt_control_xenial_image}
- ctl03:
- image: ${_param:salt_control_xenial_image}
- dbs01:
- image: ${_param:salt_control_xenial_image}
- dbs02:
- image: ${_param:salt_control_xenial_image}
- dbs03:
- image: ${_param:salt_control_xenial_image}
- msg01:
- image: ${_param:salt_control_xenial_image}
- msg02:
- image: ${_param:salt_control_xenial_image}
- msg03:
- image: ${_param:salt_control_xenial_image}
- prx01:
- image: ${_param:salt_control_xenial_image}
- prx02:
- image: ${_param:salt_control_xenial_image}
- virt:
- nic:
- default:
- eth1:
- bridge: br-mgmt
- model: virtio
- eth0:
- bridge: br-ctl
- model: virtio
- glusterfs:
- server:
- volumes:
- nova_instances:
- storage: /srv/glusterfs/nova_instances
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances
- - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
- - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
- options:
- cluster.readdir-optimize: 'On'
- nfs.disable: 'On'
- network.remote-dio: 'On'
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
- linux:
- network:
- interface:
- deploy:
- enabled: true
- type: eth
- proto: manual
- address: 0.0.0.0
- netmask: 255.255.255.0
- name: ${_param:deploy_nic}
- noifupdown: true
- br-mgmt:
- enabled: true
- proto: dhcp
- type: bridge
- name_servers: ${_param:opnfv_name_servers}
- use_interfaces:
- - ${_param:deploy_nic}
- noifupdown: true
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:deploy_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ - cluster.baremetal-mcp-ocata-common.infra.kvm
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
index 9c76526a3..76ae34f19 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
@@ -1,127 +1,4 @@
---
classes:
- - system.maas.region.single
- - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-parameters:
- _param:
- dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
- primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
- pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface}
- interface_mtu: 1500
- # MaaS has issues using MTU > 1500 for PXE interface
- pxe_interface_mtu: 1500
- linux_system_codename: xenial
- maas_admin_username: opnfv
- maas_admin_password: opnfv_secret
- maas_db_password: opnfv_secret
- dns_server01: ${_param:opnfv_dns_server01}
- single_address: ${_param:infra_maas_node01_deploy_address}
- maas:
- region:
- salt_master_ip: ${_param:infra_config_deploy_address}
- domain: ${_param:cluster_domain}
- maas_config:
- commissioning_distro_series: 'xenial'
- default_distro_series: 'xenial'
- default_osystem: 'ubuntu'
- default_storage_layout: 'lvm'
- disk_erase_with_secure_erase: false
- dnssec_validation: 'no'
- enable_third_party_drivers: true
- network_discovery: 'enabled'
- default_min_hwe_kernel: 'hwe-16.04'
- subnets:
- opnfv_maas_pxe:
- name: ${_param:opnfv_maas_pxe_network_address}/24
- cidr: ${_param:opnfv_maas_pxe_network_address}/24
- gateway_ip: ${_param:single_address}
- iprange:
- start: ${_param:opnfv_maas_pxe_start_address}
- end: ${_param:opnfv_maas_pxe_end_address}
- type: dynamic
- vlans:
- untagged:
- vid: 0
- dhcp_on: true
- primary_rack: ${_param:infra_maas_node01_hostname}
- machines:
- kvm01:
- interface:
- mac: ${_param:opnfv_maas_node01_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node01_power_address}
- power_password: ${_param:opnfv_maas_node01_power_password}
- power_type: ${_param:opnfv_maas_node01_power_type}
- power_user: ${_param:opnfv_maas_node01_power_user}
- architecture: ${_param:opnfv_maas_node01_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm02:
- interface:
- mac: ${_param:opnfv_maas_node02_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node02_power_address}
- power_password: ${_param:opnfv_maas_node02_power_password}
- power_type: ${_param:opnfv_maas_node02_power_type}
- power_user: ${_param:opnfv_maas_node02_power_user}
- architecture: ${_param:opnfv_maas_node02_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm03:
- interface:
- mac: ${_param:opnfv_maas_node03_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node03_power_address}
- power_password: ${_param:opnfv_maas_node03_power_password}
- power_type: ${_param:opnfv_maas_node03_power_type}
- power_user: ${_param:opnfv_maas_node03_power_user}
- architecture: ${_param:opnfv_maas_node03_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp001:
- interface:
- mac: ${_param:opnfv_maas_node04_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node04_power_address}
- power_password: ${_param:opnfv_maas_node04_power_password}
- power_type: ${_param:opnfv_maas_node04_power_type}
- power_user: ${_param:opnfv_maas_node04_power_user}
- architecture: ${_param:opnfv_maas_node04_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp002:
- interface:
- mac: ${_param:opnfv_maas_node05_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node05_power_address}
- power_password: ${_param:opnfv_maas_node05_power_password}
- power_type: ${_param:opnfv_maas_node05_power_type}
- power_user: ${_param:opnfv_maas_node05_power_user}
- architecture: ${_param:opnfv_maas_node05_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- linux:
- network:
- interface:
- dhcp_interface:
- enabled: true
- name: ${_param:dhcp_interface}
- type: eth
- proto: dhcp
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:infra_maas_node01_address}
- netmask: 255.255.255.0
- type: eth
- pxe_interface:
- enabled: true
- name: ${_param:pxe_interface}
- mtu: ${_param:pxe_interface_mtu}
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- type: eth
+ - cluster.baremetal-mcp-ocata-common.infra.maas
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
index 083a2df68..6e2495ad8 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
@@ -1,12 +1,4 @@
---
classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
-parameters:
- _param:
- dhcp_nic: eth0
- single_nic: eth1
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_benchmark
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index e8fc0870f..3f8251b1a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -1,36 +1,9 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
- - system.nova.compute.nfv.hugepages
- - system.nova.compute.nfv.cpu_pinning
- - system.neutron.compute.nfv.dpdk
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
- - system.cinder.volume.backend.lvm
- - system.ceilometer.agent.cluster
+ - cluster.baremetal-mcp-ocata-common.openstack_compute
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+ - system.neutron.compute.nfv.dpdk
parameters:
- _param:
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:control_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
- external_nic: ${_param:opnfv_baremetal_tertiary_nic}
- interface_mtu: 1500
- keepalived_vip_interface: br-ctl
- keepalived_vip_virtual_router_id: 69
- loopback_device_size: 20
- linux_system_codename: xenial
neutron:
gateway:
dpdk: 'True'
@@ -40,22 +13,8 @@ parameters:
compute:
libvirt_service: libvirtd
libvirt_bin: /etc/default/libvirtd
- glusterfs:
- client:
- volumes:
- nova_instances:
- path: /var/lib/nova/instances
- server: ${_param:glusterfs_service_host}
- user: nova
- group: nova
- # yamllint disable-line rule:line-length
- opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
system:
- kernel:
- sysctl:
- vm.dirty_ratio: 10
- vm.dirty_background_ratio: 5
repo:
uca:
# yamllint disable-line rule:line-length
@@ -64,53 +23,7 @@ parameters:
key_id: EC4926EA
key_server: keyserver.ubuntu.com
network:
- bridge: openvswitch
interface:
- mgmt_nic:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:mgmt_nic}
- external_nic:
- enabled: true
- name: ${_param:external_nic}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:mgmt_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
- br-floating:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
- 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: 255.255.255.0
- use_interfaces:
- - ${_param:external_nic}
- use_ovs_ports:
- - float-to-ex
dpdk0:
name: ${_param:dpdk0_name}
pci: ${_param:dpdk0_pci}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
index 1aba5242a..7fc1897b7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
@@ -1,90 +1,10 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.ceilometer.client
- - system.memcached.server.single
- - system.keystone.server.cluster
- - system.keystone.server.wsgi
- - system.glance.control.cluster
- system.neutron.control.openvswitch.cluster
- - system.nova.control.cluster
- - system.cinder.control.cluster
- - system.cinder.control.backend.lvm
- - system.heat.server.cluster
- - system.designate.server.cluster
- - system.designate.server.backend.bind
- - system.bind.server.single
- - system.haproxy.proxy.listen.openstack.nova-placement
- - system.haproxy.proxy.listen.openstack.glare
- - system.glusterfs.client.cluster
- - system.glusterfs.client.volume.glance
- - system.glusterfs.client.volume.keystone
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+ - cluster.baremetal-mcp-ocata-common.openstack_control
parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 50
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
neutron:
server:
backend:
tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- keystone:
- server:
- cacert: /etc/ssl/certs/mcp_os_cacert
- bind:
- server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
- designate:
- server:
- pools:
- default:
- description: 'test pool'
- targets:
- default:
- description: 'test target1'
- default1:
- type: ${_param:designate_pool_target_type}
- description: 'test target2'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node02_address}
- port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- default2:
- type: ${_param:designate_pool_target_type}
- description: 'test target3'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node03_address}
- port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
index 1b3c5c5a9..2f326a11c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
@@ -1,12 +1,4 @@
---
classes:
- - system.horizon.server.single
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
-parameters:
- _param:
- horizon_site_branding: OpenStack Dashboard
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
index 9ecf7e923..4644717f9 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
@@ -1,36 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.galera.server.cluster
- - system.galera.server.database.aodh
- - system.galera.server.database.ceilometer
- - system.galera.server.database.cinder
- - system.galera.server.database.designate
- - system.galera.server.database.glance
- - system.galera.server.database.grafana
- - system.galera.server.database.heat
- - system.galera.server.database.keystone
- - system.galera.server.database.nova
- - system.galera.server.database.neutron
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 80
- galera_server_cluster_name: openstack_cluster
- galera_max_connections: 3072
- galera_innodb_buffer_pool_size: 2048M
- cluster_vip_address: ${_param:openstack_database_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: dbs01
- cluster_node01_address: ${_param:openstack_database_node01_address}
- cluster_node02_hostname: dbs02
- cluster_node02_address: ${_param:openstack_database_node02_address}
- cluster_node03_hostname: dbs03
- cluster_node03_address: ${_param:openstack_database_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_database
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
index 9fa69baf3..24c481634 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
@@ -1,101 +1,9 @@
---
-# yamllint disable rule:line-length
+classes:
+ - cluster.baremetal-mcp-ocata-common.openstack_init
parameters:
_param:
-
- openstack_version: ocata
-
- openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
- openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
- openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
- openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
- openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
- openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
- openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node02_hostname: gtw02
- openstack_gateway_node03_hostname: gtw03
-
- # openstack service addresses
- openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
- openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
- openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
- openstack_control_address: ${_param:opnfv_openstack_control_address}
- openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
- openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
- openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
- openstack_database_address: ${_param:opnfv_openstack_database_address}
- openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
- openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
- openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
- openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
- openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
- openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
- openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
-
-
- openstack_telemetry_hostname: mdb
- openstack_telemetry_node01_hostname: mdb01
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_hostname: mdb03
-
- openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
- openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
- openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
- openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
-
- # OpenStack Compute
- openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
- openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
- openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
- openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
- openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
- openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
- openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
- openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
- openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
- openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
- openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
-
- # openstack service hostnames
- openstack_proxy_hostname: prx
- openstack_proxy_node01_hostname: prx01
- openstack_proxy_node02_hostname: prx02
- openstack_control_hostname: ctl
- openstack_control_node01_hostname: ctl01
- openstack_control_node02_hostname: ctl02
- openstack_control_node03_hostname: ctl03
- openstack_database_hostname: dbs
- openstack_database_node01_hostname: dbs01
- openstack_database_node02_hostname: dbs02
- openstack_database_node03_hostname: dbs03
- openstack_message_queue_hostname: msg
- openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_hostname: msg03
-
- # openstack compute
- openstack_compute_node01_hostname: cmp001
- openstack_compute_node02_hostname: cmp002
-
- openstack_region: RegionOne
- admin_email: root@localhost
- # Neutron osv/nodvr
- neutron_control_dvr: 'False'
neutron_tenant_network_types: "flat,vlan"
- neutron_l3_ha: 'True'
- neutron_global_physnet_mtu: 1500
- neutron_external_mtu: 1500
- neutron_gateway_dvr: 'False'
- neutron_gateway_agent_mode: legacy
- neutron_compute_dvr: 'False'
- neutron_compute_agent_mode: legacy
- neutron_compute_external_access: 'True'
- galera_server_cluster_name: openstack_cluster
- galera_server_maintenance_password: opnfv_secret
- galera_server_admin_password: opnfv_secret
- rabbitmq_secret_key: opnfv_secret
- rabbitmq_admin_password: opnfv_secret
- rabbitmq_openstack_password: opnfv_secret
neutron_tenant_vlan_range: "1000:1030"
nova_cpu_pinning: "5-7,13-15"
compute_hugepages_size: 2M
@@ -107,98 +15,6 @@ parameters:
compute_ovs_dpdk_socket_mem: "2048,2048"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
- glance_version: ${_param:openstack_version}
- glance_service_host: ${_param:openstack_control_address}
- keystone_version: ${_param:openstack_version}
- keystone_service_host: ${_param:openstack_control_address}
- heat_version: ${_param:openstack_version}
- heat_service_host: ${_param:openstack_control_address}
- heat_domain_admin_password: opnfv_secret
- cinder_version: ${_param:openstack_version}
- cinder_service_host: ${_param:openstack_control_address}
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:openstack_telemetry_address}
- ceilometer_influxdb_password: opnfv_secret
- nova_version: ${_param:openstack_version}
- nova_service_host: ${_param:openstack_control_address}
- neutron_version: ${_param:openstack_version}
- neutron_service_host: ${_param:openstack_control_address}
- glusterfs_service_host: ${_param:infra_kvm_address}
- mysql_admin_user: root
- mysql_admin_password: opnfv_secret
- mysql_cinder_password: opnfv_secret
- mysql_ceilometer_password: opnfv_secret
- mysql_glance_password: opnfv_secret
- mysql_grafana_password: opnfv_secret
- mysql_heat_password: opnfv_secret
- mysql_keystone_password: opnfv_secret
- mysql_neutron_password: opnfv_secret
- mysql_nova_password: opnfv_secret
- mysql_aodh_password: opnfv_secret
- mysql_designate_password: opnfv_secret
- aodh_version: ${_param:openstack_version}
- keystone_aodh_password: opnfv_secret
- keystone_service_token: opnfv_secret
- keystone_admin_password: opnfv_secret
- keystone_ceilometer_password: opnfv_secret
- keystone_cinder_password: opnfv_secret
- keystone_glance_password: opnfv_secret
- keystone_heat_password: opnfv_secret
- keystone_keystone_password: opnfv_secret
- keystone_neutron_password: opnfv_secret
- keystone_nova_password: opnfv_secret
- keystone_designate_password: opnfv_secret
- ceilometer_secret_key: opnfv_secret
- horizon_version: ${_param:openstack_version}
- # yamllint disable rule:line-length
- horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
- horizon_identity_host: ${_param:openstack_control_address}
- horizon_identity_encryption: none
- horizon_identity_version: 2
- mongodb_server_replica_set: ceilometer
- mongodb_ceilometer_password: opnfv_secret
- mongodb_admin_password: opnfv_secret
- mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
- metadata_password: opnfv_secret
- openstack_telemetry_keepalived_password: opnfv_secret
- aodh_service_host: ${_param:openstack_telemetry_address}
- designate_service_host: ${_param:openstack_control_address}
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- designate_pool_ns_records:
- - hostname: 'ns1.example.org.'
- priority: 10
- designate_pool_nameservers:
- - host: ${_param:openstack_control_node01_address}
- port: 53
- - host: ${_param:openstack_control_node02_address}
- port: 53
- - host: ${_param:openstack_control_node03_address}
- port: 53
- designate_pool_target_type: bind9
- designate_pool_target_masters:
- - host: ${_param:openstack_control_node01_address}
- port: 5354
- - host: ${_param:openstack_control_node02_address}
- port: 5354
- - host: ${_param:openstack_control_node03_address}
- port: 5354
- designate_pool_target_options:
- host: ${_param:openstack_control_node01_address}
- port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- designate_version: ${_param:openstack_version}
- # Billing
- # keystone_billometer_password: opnfv_secret
- # keystone_billometer_address: ${_param:billometer_service_host}
- # billometer_service_host: ${_param:openstack_billing_address}
- # billometer_version: ${_param:openstack_version}
- # billometer_secret_key: opnfv_secretpasswordpasswordpassword
- # billometer_identity_password: ${_param:keystone_billometer_password}
- # billometer_identity_host: ${_param:openstack_control_address}
- # billometer_identity_token: ${_param:keystone_service_token}
linux:
system:
repo:
@@ -212,120 +28,3 @@ parameters:
net.ipv4.tcp_congestion_control: yeah
net.ipv4.tcp_slow_start_after_idle: 0
net.ipv4.tcp_fin_timeout: 30
- network:
- host:
- prx:
- address: ${_param:openstack_proxy_address}
- names:
- - ${_param:openstack_proxy_hostname}
- - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
- prx01:
- address: ${_param:openstack_proxy_node01_address}
- names:
- - ${_param:openstack_proxy_node01_hostname}
- - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
- prx02:
- address: ${_param:openstack_proxy_node02_address}
- names:
- - ${_param:openstack_proxy_node02_hostname}
- - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
- ctl:
- address: ${_param:openstack_control_address}
- names:
- - ${_param:openstack_control_hostname}
- - ${_param:openstack_control_hostname}.${_param:cluster_domain}
- ctl01:
- address: ${_param:openstack_control_node01_address}
- names:
- - ${_param:openstack_control_node01_hostname}
- - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
- ctl02:
- address: ${_param:openstack_control_node02_address}
- names:
- - ${_param:openstack_control_node02_hostname}
- - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
- ctl03:
- address: ${_param:openstack_control_node03_address}
- names:
- - ${_param:openstack_control_node03_hostname}
- - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
- msg:
- address: ${_param:openstack_message_queue_address}
- names:
- - ${_param:openstack_message_queue_hostname}
- - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
- msg01:
- address: ${_param:openstack_message_queue_node01_address}
- names:
- - ${_param:openstack_message_queue_node01_hostname}
- - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- msg02:
- address: ${_param:openstack_message_queue_node02_address}
- names:
- - ${_param:openstack_message_queue_node02_hostname}
- - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
- msg03:
- address: ${_param:openstack_message_queue_node03_address}
- names:
- - ${_param:openstack_message_queue_node03_hostname}
- - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
- dbs:
- address: ${_param:openstack_database_address}
- names:
- - ${_param:openstack_database_hostname}
- - ${_param:openstack_database_hostname}.${_param:cluster_domain}
- dbs01:
- address: ${_param:openstack_database_node01_address}
- names:
- - ${_param:openstack_database_node01_hostname}
- - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- dbs02:
- address: ${_param:openstack_database_node02_address}
- names:
- - ${_param:openstack_database_node02_hostname}
- - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
- dbs03:
- address: ${_param:openstack_database_node03_address}
- names:
- - ${_param:openstack_database_node03_hostname}
- - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
- mdb:
- address: ${_param:openstack_telemetry_address}
- names:
- - ${_param:openstack_telemetry_hostname}
- - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
- mdb01:
- address: ${_param:openstack_telemetry_node01_address}
- names:
- - ${_param:openstack_telemetry_node01_hostname}
- - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
- mdb02:
- address: ${_param:openstack_telemetry_node02_address}
- names:
- - ${_param:openstack_telemetry_node02_hostname}
- - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
- mdb03:
- address: ${_param:openstack_telemetry_node03_address}
- names:
- - ${_param:openstack_telemetry_node03_hostname}
- - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
- cmp001:
- address: ${_param:openstack_compute_node01_control_address}
- names:
- - ${_param:openstack_compute_node01_hostname}
- - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
- cmp002:
- address: ${_param:openstack_compute_node02_control_address}
- names:
- - ${_param:openstack_compute_node02_hostname}
- - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
-# gtw01:
-# address: ${_param:openstack_gateway_node01_address}
-# names:
-# - ${_param:openstack_gateway_node01_hostname}
-# - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
-# gtw02:
-# address: ${_param:openstack_gateway_node02_address}
-# names:
-# - ${_param:openstack_gateway_node02_hostname}
-# - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
index ba9e0656f..db3b29f13 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
@@ -1,24 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.rabbitmq.server.cluster
- - system.rabbitmq.server.vhost.openstack
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 90
- cluster_vip_address: ${_param:openstack_message_queue_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: msg01
- cluster_node01_address: ${_param:openstack_message_queue_node01_address}
- cluster_node02_hostname: msg02
- cluster_node02_address: ${_param:openstack_message_queue_node02_address}
- cluster_node03_hostname: msg03
- cluster_node03_address: ${_param:openstack_message_queue_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_message_queue
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index 16c4a0968..1c1aa1149 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -1,42 +1,5 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.nginx.server.single
- - system.nginx.server.proxy.openstack_api
- - system.nginx.server.proxy.openstack_vnc
- - system.nginx.server.proxy.openstack_web
- - system.nginx.server.proxy.openstack.aodh
- - system.nginx.server.proxy.openstack.ceilometer
- - system.horizon.server.single
- - system.salt.minion.cert.proxy
- - system.sphinx.server.doc.reclass
- - service.keepalived.cluster.single
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard
-# - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.proxy
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_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:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- system:
- package:
- libapache2-mod-wsgi:
- salt:
- minion:
- cert:
- proxy:
- alternative_names: "IP:${_param:openstack_proxy_address}"
- key_usage: 'digitalSignature, keyEncipherment'
+ - cluster.baremetal-mcp-ocata-common.openstack_proxy
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
index 38267218c..5373fbab5 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
@@ -1,33 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.mongodb.server.cluster
- - system.mongodb.server.database.ceilometer
- - system.ceilometer.server.backend.mongodb
- # - system.ceilometer.server.backend.influxdb
- # - system.heka.ceilometer_collector.single
- - system.ceilometer.server.cluster
- - system.aodh.server.cluster
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-parameters:
- _param:
- keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 230
- cluster_vip_address: ${_param:openstack_telemetry_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: mdb01
- cluster_node01_address: ${_param:openstack_telemetry_node01_address}
- cluster_node02_hostname: mdb02
- cluster_node02_address: ${_param:openstack_telemetry_node02_address}
- cluster_node03_hostname: mdb03
- cluster_node03_address: ${_param:openstack_telemetry_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- mongodb:
- server:
- logging:
- verbose: v
+ - cluster.baremetal-mcp-ocata-common.openstack_telemetry
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 75c20f4b4..3feb4f301 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
@@ -1,137 +1,4 @@
---
classes:
- - service.git.client
- - system.linux.system.single
- - system.linux.system.repo.mcp.salt
- - system.linux.system.repo.saltstack.xenial
- - system.salt.master.api
- - system.salt.master.pkg
- - system.salt.minion.ca.salt_master
- - system.reclass.storage.salt
- - system.reclass.storage.system.physical_control_cluster
- - system.reclass.storage.system.openstack_control_cluster
- - system.reclass.storage.system.openstack_proxy_cluster
- - system.reclass.storage.system.openstack_database_cluster
- - system.reclass.storage.system.openstack_message_queue_cluster
- - system.reclass.storage.system.openstack_telemetry_cluster
- # - 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.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
- _param:
- salt_master_base_environment: prd
- reclass_data_repository: local
- salt_master_environment_repository: "https://github.com/tcpcloud"
- salt_master_environment_revision: master
- single_address: ${_param:infra_config_address}
- deploy_address: ${_param:infra_config_deploy_address}
- salt_master_host: ${_param:infra_config_deploy_address}
- # yamllint disable rule:line-length
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- dhcp_nic: ${_param:opnfv_fn_vm_primary_interface}
- single_nic: ${_param:opnfv_fn_vm_secondary_interface}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- salt:
- master:
- accept_policy: open_mode
- file_recv: true
- reclass:
- storage:
- data_source:
- engine: local
- node:
- infra_kvm_node01:
- params:
- keepalived_vip_priority: 100
- linux_system_codename: xenial
- infra_kvm_node02:
- params:
- keepalived_vip_priority: 101
- linux_system_codename: xenial
- infra_kvm_node03:
- params:
- keepalived_vip_priority: 102
- linux_system_codename: xenial
- openstack_telemetry_node01:
- params:
- linux_system_codename: xenial
- openstack_telemetry_node02:
- params:
- linux_system_codename: xenial
- openstack_telemetry_node03:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node01:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node02:
- params:
- linux_system_codename: xenial
- openstack_message_queue_node03:
- params:
- linux_system_codename: xenial
- openstack_proxy_node01:
- params:
- linux_system_codename: xenial
- openstack_proxy_node02:
- params:
- linux_system_codename: xenial
- # stacklight_log_node01:
- # classes:
- # - system.elasticsearch.client.single
- # stacklight_monitor_node01:
- # classes:
- # - system.grafana.client.single
- # - system.kibana.client.single
- openstack_control_node01:
- classes:
- - cluster.${_param:cluster_name}.openstack.control_init
- params:
- linux_system_codename: xenial
- openstack_control_node02:
- params:
- linux_system_codename: xenial
- openstack_control_node03:
- params:
- linux_system_codename: xenial
- openstack_database_node01:
- classes:
- - cluster.${_param:cluster_name}.openstack.database_init
- params:
- linux_system_codename: xenial
- openstack_database_node02:
- params:
- linux_system_codename: xenial
- openstack_database_node03:
- params:
- linux_system_codename: xenial
- openstack_compute_node01:
- name: ${_param:openstack_compute_node01_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.compute
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- control_address: ${_param:openstack_compute_node01_control_address}
- single_address: ${_param:openstack_compute_node01_single_address}
- tenant_address: ${_param:openstack_compute_node01_tenant_address}
- external_address: ${_param:openstack_compute_node01_external_address}
- openstack_compute_node02:
- name: ${_param:openstack_compute_node02_hostname}
- domain: ${_param:cluster_domain}
- classes:
- - cluster.${_param:cluster_name}.openstack.compute
- params:
- salt_master_host: ${_param:reclass_config_master}
- linux_system_codename: xenial
- control_address: ${_param:openstack_compute_node02_control_address}
- single_address: ${_param:openstack_compute_node02_single_address}
- tenant_address: ${_param:openstack_compute_node02_tenant_address}
- external_address: ${_param:openstack_compute_node02_external_address}
+ - cluster.baremetal-mcp-ocata-common.infra.config
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index 7c250a30e..29615fb57 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -1,103 +1,7 @@
---
classes:
- - system.linux.system.single
- - cluster.all-mcp-ocata-common
- cluster.baremetal-mcp-ocata-ovs-ha.openstack
- # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight
- # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client
+ - cluster.baremetal-mcp-ocata-common.infra
parameters:
_param:
- apt_mk_version: nightly
- mcp_repo_version: 1.1
- salt_version: 2016.11
cluster_name: baremetal-mcp-ocata-ovs-ha
- cluster_domain: ${_param:cluster_name}.local
- # stacklight_environment: ${_param:cluster_domain}
- reclass_data_revision: master
- cluster_public_host: ${_param:openstack_proxy_address}
- infra_config_hostname: cfg01
- infra_maas_database_password: opnfv_secret
-
- # infra service addresses
- infra_config_address: ${_param:opnfv_infra_config_address}
- infra_config_deploy_address: ${_param:reclass_config_master}
- infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address}
- infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address}
- infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address}
- infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address}
- infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address}
-
- infra_kvm_address: ${_param:opnfv_infra_kvm_address}
- infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
- infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
- infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
-
- infra_maas_node01_hostname: mas01
- infra_kvm_node01_hostname: kvm01
- infra_kvm_node02_hostname: kvm02
- infra_kvm_node03_hostname: kvm03
-
- ntp_strata_host1: 1.pool.ntp.org
- ntp_strata_host2: 0.pool.ntp.org
-
- # Interface definitions
- reclass:
- storage:
- node:
- name: default
- dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
- single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
- linux_dhcp_interface:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:dhcp_nic}
- linux_single_interface:
- enabled: true
- type: eth
- proto: static
- name: ${_param:single_nic}
- address: ${_param:single_address}
- netmask: 255.255.255.0
-
- # yamllint disable-line rule:line-length
- salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
- linux:
- system:
- user:
- ubuntu:
- enabled: true
- sudo: true
- home: /home/ubuntu
- network:
- host:
- cfg01:
- address: ${_param:infra_config_address}
- names:
- - cfg01
- - cfg01.${_param:cluster_domain}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - ${_param:infra_config_hostname}
- - ${_param:infra_config_hostname}.${_param:cluster_domain}
- mas01:
- address: ${_param:infra_maas_node01_address}
- names:
- - ${_param:infra_maas_node01_hostname}
- - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
- kvm01:
- address: ${_param:infra_kvm_node01_address}
- names:
- - ${_param:infra_kvm_node01_hostname}
- - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
- kvm02:
- address: ${_param:infra_kvm_node02_address}
- names:
- - ${_param:infra_kvm_node02_hostname}
- - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
- kvm03:
- address: ${_param:infra_kvm_node03_address}
- names:
- - ${_param:infra_kvm_node03_hostname}
- - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index eb73e1cca..9a4577def 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -1,163 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - service.keepalived.cluster.single
- - system.glusterfs.server.volume.glance
- - system.glusterfs.server.volume.keystone
- - system.glusterfs.server.cluster
- - system.salt.control.virt
- - system.salt.control.cluster.openstack_control_cluster
- - system.salt.control.cluster.openstack_proxy_cluster
- - system.salt.control.cluster.openstack_database_cluster
- - system.salt.control.cluster.openstack_message_queue_cluster
- - system.salt.control.cluster.openstack_telemetry_cluster
- # - system.salt.control.cluster.stacklight_server_cluster
- # - system.salt.control.cluster.stacklight_log_cluster
- # - system.salt.control.cluster.stacklight_telemetry_cluster
- cluster.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
- _param:
- linux_system_codename: xenial
- cluster_vip_address: ${_param:infra_kvm_address}
- cluster_node01_address: ${_param:infra_kvm_node01_address}
- cluster_node02_address: ${_param:infra_kvm_node02_address}
- cluster_node03_address: ${_param:infra_kvm_node03_address}
- keepalived_vip_interface: br-ctl
- keepalived_vip_virtual_router_id: 69
- deploy_nic: ${_param:opnfv_baremetal_primary_nic}
- salt:
- control:
- size: # RAM 4096,8192,16384,32768,65536
- # Default production sizing
- openstack.control:
- cpu: 4
- ram: 12288
- disk_profile: small
- net_profile: default
- openstack.database:
- cpu: 4
- ram: 6144
- disk_profile: large
- net_profile: default
- openstack.message_queue:
- cpu: 4
- ram: 2048
- disk_profile: small
- net_profile: default
- openstack.telemetry:
- cpu: 2
- ram: 3072
- disk_profile: xxlarge
- net_profile: default
- # stacklight.log:
- # cpu: 2
- # ram: 4096
- # disk_profile: xxlarge
- # net_profile: default
- # stacklight.server:
- # cpu: 2
- # ram: 4096
- # disk_profile: small
- # net_profile: default
- # stacklight.telemetry:
- # cpu: 2
- # ram: 4096
- # disk_profile: xxlarge
- # net_profile: default
- openstack.proxy:
- cpu: 2
- ram: 2048
- disk_profile: small
- net_profile: default
- cluster:
- internal:
- node:
- mdb01:
- image: ${_param:salt_control_xenial_image}
- mdb02:
- image: ${_param:salt_control_xenial_image}
- mdb03:
- image: ${_param:salt_control_xenial_image}
- ctl01:
- image: ${_param:salt_control_xenial_image}
- ctl02:
- image: ${_param:salt_control_xenial_image}
- ctl03:
- image: ${_param:salt_control_xenial_image}
- dbs01:
- image: ${_param:salt_control_xenial_image}
- dbs02:
- image: ${_param:salt_control_xenial_image}
- dbs03:
- image: ${_param:salt_control_xenial_image}
- msg01:
- image: ${_param:salt_control_xenial_image}
- msg02:
- image: ${_param:salt_control_xenial_image}
- msg03:
- image: ${_param:salt_control_xenial_image}
- prx01:
- image: ${_param:salt_control_xenial_image}
- prx02:
- image: ${_param:salt_control_xenial_image}
- provider: kvm03.${_param:cluster_domain}
- virt:
- nic:
- default:
- eth1:
- bridge: br-mgmt
- model: virtio
- eth0:
- bridge: br-ctl
- model: virtio
- glusterfs:
- server:
- volumes:
- nova_instances:
- storage: /srv/glusterfs/nova_instances
- replica: 3
- bricks:
- - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances
- - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
- - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
- options:
- cluster.readdir-optimize: 'On'
- nfs.disable: 'On'
- network.remote-dio: 'On'
- diagnostics.client-log-level: WARNING
- diagnostics.brick-log-level: WARNING
- linux:
- network:
- interface:
- deploy:
- enabled: true
- type: eth
- proto: manual
- address: 0.0.0.0
- netmask: 255.255.255.0
- name: ${_param:deploy_nic}
- noifupdown: true
- br-mgmt:
- enabled: true
- proto: dhcp
- type: bridge
- name_servers: ${_param:opnfv_name_servers}
- use_interfaces:
- - ${_param:deploy_nic}
- noifupdown: true
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:deploy_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+ - cluster.baremetal-mcp-ocata-common.infra.kvm
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index 1ec662d93..0529fa7bf 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -1,127 +1,4 @@
---
classes:
- - system.maas.region.single
- - service.maas.cluster.single
- cluster.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
- _param:
- dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
- primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
- pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface}
- interface_mtu: 1500
- # MaaS has issues using MTU > 1500 for PXE interface
- pxe_interface_mtu: 1500
- linux_system_codename: xenial
- maas_admin_username: opnfv
- maas_admin_password: opnfv_secret
- maas_db_password: opnfv_secret
- dns_server01: ${_param:opnfv_dns_server01}
- single_address: ${_param:infra_maas_node01_deploy_address}
- maas:
- region:
- salt_master_ip: ${_param:infra_config_deploy_address}
- domain: ${_param:cluster_domain}
- maas_config:
- commissioning_distro_series: 'xenial'
- default_distro_series: 'xenial'
- default_osystem: 'ubuntu'
- default_storage_layout: 'lvm'
- disk_erase_with_secure_erase: false
- dnssec_validation: 'no'
- enable_third_party_drivers: true
- network_discovery: 'enabled'
- default_min_hwe_kernel: 'hwe-16.04'
- subnets:
- opnfv_maas_pxe:
- name: ${_param:opnfv_maas_pxe_network_address}/24
- cidr: ${_param:opnfv_maas_pxe_network_address}/24
- gateway_ip: ${_param:single_address}
- iprange:
- start: ${_param:opnfv_maas_pxe_start_address}
- end: ${_param:opnfv_maas_pxe_end_address}
- type: dynamic
- vlans:
- untagged:
- vid: 0
- dhcp_on: true
- primary_rack: ${_param:infra_maas_node01_hostname}
- machines:
- kvm01:
- interface:
- mac: ${_param:opnfv_maas_node01_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node01_power_address}
- power_password: ${_param:opnfv_maas_node01_power_password}
- power_type: ${_param:opnfv_maas_node01_power_type}
- power_user: ${_param:opnfv_maas_node01_power_user}
- architecture: ${_param:opnfv_maas_node01_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm02:
- interface:
- mac: ${_param:opnfv_maas_node02_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node02_power_address}
- power_password: ${_param:opnfv_maas_node02_power_password}
- power_type: ${_param:opnfv_maas_node02_power_type}
- power_user: ${_param:opnfv_maas_node02_power_user}
- architecture: ${_param:opnfv_maas_node02_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- kvm03:
- interface:
- mac: ${_param:opnfv_maas_node03_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node03_power_address}
- power_password: ${_param:opnfv_maas_node03_power_password}
- power_type: ${_param:opnfv_maas_node03_power_type}
- power_user: ${_param:opnfv_maas_node03_power_user}
- architecture: ${_param:opnfv_maas_node03_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp001:
- interface:
- mac: ${_param:opnfv_maas_node04_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node04_power_address}
- power_password: ${_param:opnfv_maas_node04_power_password}
- power_type: ${_param:opnfv_maas_node04_power_type}
- power_user: ${_param:opnfv_maas_node04_power_user}
- architecture: ${_param:opnfv_maas_node04_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- cmp002:
- interface:
- mac: ${_param:opnfv_maas_node05_interface_mac}
- power_parameters:
- power_address: ${_param:opnfv_maas_node05_power_address}
- power_password: ${_param:opnfv_maas_node05_power_password}
- power_type: ${_param:opnfv_maas_node05_power_type}
- power_user: ${_param:opnfv_maas_node05_power_user}
- architecture: ${_param:opnfv_maas_node05_architecture}
- distro_series: xenial
- hwe_kernel: hwe-16.04
- linux:
- network:
- interface:
- dhcp_interface:
- enabled: true
- name: ${_param:dhcp_interface}
- type: eth
- proto: dhcp
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- mtu: ${_param:interface_mtu}
- proto: static
- address: ${_param:infra_maas_node01_address}
- netmask: 255.255.255.0
- type: eth
- pxe_interface:
- enabled: true
- name: ${_param:pxe_interface}
- mtu: ${_param:pxe_interface_mtu}
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- type: eth
+ - cluster.baremetal-mcp-ocata-common.infra.maas
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
index 7d5eb80c3..b7c022ead 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
@@ -1,12 +1,4 @@
---
classes:
- cluster.baremetal-mcp-ocata-ovs-ha
-parameters:
- _param:
- dhcp_nic: eth0
- single_nic: eth1
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_benchmark
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 165e0c9c4..f72fff613 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
@@ -1,71 +1,18 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.linux.storage.loopback
- - system.glusterfs.client.cluster
- - system.nova.compute.cluster
- - system.nova.compute.nfv.hugepages
- - system.nova.compute.nfv.cpu_pinning
- - system.neutron.gateway.cluster
- - system.cinder.volume.single
- - system.cinder.volume.backend.lvm
- - system.ceilometer.agent.cluster
+ - cluster.baremetal-mcp-ocata-common.openstack_compute
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
_param:
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:control_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- mgmt_nic: ${_param:opnfv_baremetal_primary_nic}
tenant_nic: ${_param:opnfv_baremetal_secondary_nic}
- external_nic: ${_param:opnfv_baremetal_tertiary_nic}
- linux_system_codename: xenial
- interface_mtu: 1500
- keepalived_vip_interface: br-ctl
- keepalived_vip_virtual_router_id: 69
- loopback_device_size: 20
- glusterfs:
- client:
- volumes:
- nova_instances:
- path: /var/lib/nova/instances
- server: ${_param:glusterfs_service_host}
- user: nova
- group: nova
- # yamllint disable-line rule:line-length
- opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
- system:
- kernel:
- sysctl:
- vm.dirty_ratio: 10
- vm.dirty_background_ratio: 5
network:
- bridge: openvswitch
interface:
- mgmt_nic:
- enabled: true
- type: eth
- proto: dhcp
- name: ${_param:mgmt_nic}
tenant_nic:
enabled: true
type: eth
proto: manual
name: ${_param:tenant_nic}
- external_nic:
- enabled: true
- name: ${_param:external_nic}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
br-mesh:
enabled: true
type: bridge
@@ -74,13 +21,6 @@ parameters:
mtu: 1500
use_interfaces:
- ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
- mgmt-vlan:
- enabled: true
- proto: manual
- type: vlan
- name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
- use_interfaces:
- - ${_param:mgmt_nic}
tenant-vlan:
enabled: true
proto: manual
@@ -88,30 +28,3 @@ parameters:
name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
use_interfaces:
- ${_param:tenant_nic}
- br-ctl:
- enabled: true
- type: bridge
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- use_interfaces:
- - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
- br-floating:
- enabled: true
- type: ovs_bridge
- mtu: ${_param:interface_mtu}
- 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: 255.255.255.0
- use_interfaces:
- - ${_param:external_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 3fd4fd185..d564171a7 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
@@ -1,86 +1,5 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.ceilometer.client
- - system.memcached.server.single
- - system.keystone.server.cluster
- - system.keystone.server.wsgi
- - system.glance.control.cluster
- system.neutron.control.openvswitch.cluster
- - system.nova.control.cluster
- - system.cinder.control.cluster
- - system.cinder.control.backend.lvm
- - system.heat.server.cluster
- - system.designate.server.cluster
- - system.designate.server.backend.bind
- - system.bind.server.single
- - system.haproxy.proxy.listen.openstack.nova-placement
- - system.haproxy.proxy.listen.openstack.glare
- - system.glusterfs.client.cluster
- - system.glusterfs.client.volume.glance
- - system.glusterfs.client.volume.keystone
- cluster.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 50
- cluster_vip_address: ${_param:openstack_control_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: ctl01
- cluster_node01_address: ${_param:openstack_control_node01_address}
- cluster_node02_hostname: ctl02
- cluster_node02_address: ${_param:openstack_control_node02_address}
- cluster_node03_hostname: ctl03
- cluster_node03_address: ${_param:openstack_control_node03_address}
- nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- keystone:
- server:
- cacert: /etc/ssl/certs/mcp_os_cacert
- bind:
- server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
- designate:
- server:
- pools:
- default:
- description: 'test pool'
- targets:
- default:
- description: 'test target1'
- default1:
- type: ${_param:designate_pool_target_type}
- description: 'test target2'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node02_address}
- port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- default2:
- type: ${_param:designate_pool_target_type}
- description: 'test target3'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node03_address}
- port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ - cluster.baremetal-mcp-ocata-common.openstack_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 03635ca68..2be8c2950 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
@@ -1,12 +1,4 @@
---
classes:
- - system.horizon.server.single
- cluster.baremetal-mcp-ocata-ovs-ha
-parameters:
- _param:
- horizon_site_branding: OpenStack Dashboard
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_dashboard
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 e2ee1a89c..a00c6d8de 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
@@ -1,36 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.galera.server.cluster
- - system.galera.server.database.aodh
- - system.galera.server.database.ceilometer
- - system.galera.server.database.cinder
- - system.galera.server.database.designate
- - system.galera.server.database.glance
- - system.galera.server.database.grafana
- - system.galera.server.database.heat
- - system.galera.server.database.keystone
- - system.galera.server.database.nova
- - system.galera.server.database.neutron
- cluster.baremetal-mcp-ocata-ovs-ha
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 80
- galera_server_cluster_name: openstack_cluster
- galera_max_connections: 3072
- galera_innodb_buffer_pool_size: 2048M
- cluster_vip_address: ${_param:openstack_database_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: dbs01
- cluster_node01_address: ${_param:openstack_database_node01_address}
- cluster_node02_hostname: dbs02
- cluster_node02_address: ${_param:openstack_database_node02_address}
- cluster_node03_hostname: dbs03
- cluster_node03_address: ${_param:openstack_database_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_database
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 7ce282be5..440a04075 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
@@ -1,305 +1,17 @@
---
+classes:
+ - cluster.baremetal-mcp-ocata-common.openstack_init
parameters:
_param:
-
- openstack_version: ocata
-
- # yamllint disable rule:line-length
- openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
- openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
- openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
- openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
- openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
- openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
- openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node02_hostname: gtw02
- openstack_gateway_node03_hostname: gtw03
-
- # openstack service addresses
- openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
- openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
- openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
- openstack_control_address: ${_param:opnfv_openstack_control_address}
- openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
- openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
- openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
- openstack_database_address: ${_param:opnfv_openstack_database_address}
- openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
- openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
- openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
- openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
- openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
- openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
- openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
-
-
- openstack_telemetry_hostname: mdb
- openstack_telemetry_node01_hostname: mdb01
- openstack_telemetry_node02_hostname: mdb02
- openstack_telemetry_node03_hostname: mdb03
-
- openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
- openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
- openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
- openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
-
- # OpenStack Compute
- openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
- openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
- openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
- openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
- openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
- openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
- openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
- openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
- openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
- openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
- openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
-
- # openstack service hostnames
- openstack_proxy_hostname: prx
- openstack_proxy_node01_hostname: prx01
- openstack_proxy_node02_hostname: prx02
- openstack_control_hostname: ctl
- openstack_control_node01_hostname: ctl01
- openstack_control_node02_hostname: ctl02
- openstack_control_node03_hostname: ctl03
- openstack_database_hostname: dbs
- openstack_database_node01_hostname: dbs01
- openstack_database_node02_hostname: dbs02
- openstack_database_node03_hostname: dbs03
- openstack_message_queue_hostname: msg
- openstack_message_queue_node01_hostname: msg01
- openstack_message_queue_node02_hostname: msg02
- openstack_message_queue_node03_hostname: msg03
-
- # openstack compute
- openstack_compute_node01_hostname: cmp001
- openstack_compute_node02_hostname: cmp002
-
- openstack_region: RegionOne
- admin_email: root@localhost
- # Neutron osv/nodvr
- neutron_control_dvr: 'False'
neutron_tenant_network_types: "flat,vxlan"
- neutron_l3_ha: 'True'
- neutron_global_physnet_mtu: 1500
- neutron_external_mtu: 1500
- neutron_gateway_dvr: 'False'
- neutron_gateway_agent_mode: legacy
- neutron_compute_dvr: 'False'
- neutron_compute_agent_mode: legacy
- neutron_compute_external_access: 'True'
- galera_server_cluster_name: openstack_cluster
- galera_server_maintenance_password: opnfv_secret
- galera_server_admin_password: opnfv_secret
- rabbitmq_secret_key: opnfv_secret
- rabbitmq_admin_password: opnfv_secret
- rabbitmq_openstack_password: opnfv_secret
nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
compute_hugepages_size: 1G
compute_hugepages_count: 16
compute_hugepages_mount: /mnt/hugepages_1G
compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
- glance_version: ${_param:openstack_version}
- glance_service_host: ${_param:openstack_control_address}
- keystone_version: ${_param:openstack_version}
- keystone_service_host: ${_param:openstack_control_address}
- heat_version: ${_param:openstack_version}
- heat_service_host: ${_param:openstack_control_address}
- heat_domain_admin_password: opnfv_secret
- cinder_version: ${_param:openstack_version}
- cinder_service_host: ${_param:openstack_control_address}
- ceilometer_version: ${_param:openstack_version}
- ceilometer_service_host: ${_param:openstack_telemetry_address}
- ceilometer_influxdb_password: opnfv_secret
- nova_version: ${_param:openstack_version}
- nova_service_host: ${_param:openstack_control_address}
- neutron_version: ${_param:openstack_version}
- neutron_service_host: ${_param:openstack_control_address}
- glusterfs_service_host: ${_param:infra_kvm_address}
- mysql_admin_user: root
- mysql_admin_password: opnfv_secret
- mysql_cinder_password: opnfv_secret
- mysql_ceilometer_password: opnfv_secret
- mysql_glance_password: opnfv_secret
- mysql_grafana_password: opnfv_secret
- mysql_heat_password: opnfv_secret
- mysql_keystone_password: opnfv_secret
- mysql_neutron_password: opnfv_secret
- mysql_nova_password: opnfv_secret
- mysql_aodh_password: opnfv_secret
- mysql_designate_password: opnfv_secret
- aodh_version: ${_param:openstack_version}
- keystone_aodh_password: opnfv_secret
- keystone_service_token: opnfv_secret
- keystone_admin_password: opnfv_secret
- keystone_ceilometer_password: opnfv_secret
- keystone_cinder_password: opnfv_secret
- keystone_glance_password: opnfv_secret
- keystone_heat_password: opnfv_secret
- keystone_keystone_password: opnfv_secret
- keystone_neutron_password: opnfv_secret
- keystone_nova_password: opnfv_secret
- keystone_designate_password: opnfv_secret
- ceilometer_secret_key: opnfv_secret
- horizon_version: ${_param:openstack_version}
- horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
- horizon_identity_host: ${_param:openstack_control_address}
- horizon_identity_encryption: none
- horizon_identity_version: 2
- mongodb_server_replica_set: ceilometer
- mongodb_ceilometer_password: opnfv_secret
- mongodb_admin_password: opnfv_secret
- mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
- metadata_password: opnfv_secret
- openstack_telemetry_keepalived_password: opnfv_secret
- aodh_service_host: ${_param:openstack_telemetry_address}
- designate_service_host: ${_param:openstack_control_address}
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- designate_pool_ns_records:
- - hostname: 'ns1.example.org.'
- priority: 10
- designate_pool_nameservers:
- - host: ${_param:openstack_control_node01_address}
- port: 53
- - host: ${_param:openstack_control_node02_address}
- port: 53
- - host: ${_param:openstack_control_node03_address}
- port: 53
- designate_pool_target_type: bind9
- designate_pool_target_masters:
- - host: ${_param:openstack_control_node01_address}
- port: 5354
- - host: ${_param:openstack_control_node02_address}
- port: 5354
- - host: ${_param:openstack_control_node03_address}
- port: 5354
- designate_pool_target_options:
- host: ${_param:openstack_control_node01_address}
- port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- designate_version: ${_param:openstack_version}
- # Billing
- # keystone_billometer_password: opnfv_secret
- # keystone_billometer_address: ${_param:billometer_service_host}
- # billometer_service_host: ${_param:openstack_billing_address}
- # billometer_version: ${_param:openstack_version}
- # billometer_secret_key: opnfv_secretpasswordpasswordpassword
- # billometer_identity_password: ${_param:keystone_billometer_password}
- # billometer_identity_host: ${_param:openstack_control_address}
- # billometer_identity_token: ${_param:keystone_service_token}
linux:
network:
host:
- prx:
- address: ${_param:openstack_proxy_address}
- names:
- - ${_param:openstack_proxy_hostname}
- - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
- prx01:
- address: ${_param:openstack_proxy_node01_address}
- names:
- - ${_param:openstack_proxy_node01_hostname}
- - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
- prx02:
- address: ${_param:openstack_proxy_node02_address}
- names:
- - ${_param:openstack_proxy_node02_hostname}
- - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
- ctl:
- address: ${_param:openstack_control_address}
- names:
- - ${_param:openstack_control_hostname}
- - ${_param:openstack_control_hostname}.${_param:cluster_domain}
- ctl01:
- address: ${_param:openstack_control_node01_address}
- names:
- - ${_param:openstack_control_node01_hostname}
- - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
- ctl02:
- address: ${_param:openstack_control_node02_address}
- names:
- - ${_param:openstack_control_node02_hostname}
- - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
- ctl03:
- address: ${_param:openstack_control_node03_address}
- names:
- - ${_param:openstack_control_node03_hostname}
- - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
- msg:
- address: ${_param:openstack_message_queue_address}
- names:
- - ${_param:openstack_message_queue_hostname}
- - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
- msg01:
- address: ${_param:openstack_message_queue_node01_address}
- names:
- - ${_param:openstack_message_queue_node01_hostname}
- - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
- msg02:
- address: ${_param:openstack_message_queue_node02_address}
- names:
- - ${_param:openstack_message_queue_node02_hostname}
- - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
- msg03:
- address: ${_param:openstack_message_queue_node03_address}
- names:
- - ${_param:openstack_message_queue_node03_hostname}
- - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
- dbs:
- address: ${_param:openstack_database_address}
- names:
- - ${_param:openstack_database_hostname}
- - ${_param:openstack_database_hostname}.${_param:cluster_domain}
- dbs01:
- address: ${_param:openstack_database_node01_address}
- names:
- - ${_param:openstack_database_node01_hostname}
- - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
- dbs02:
- address: ${_param:openstack_database_node02_address}
- names:
- - ${_param:openstack_database_node02_hostname}
- - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
- dbs03:
- address: ${_param:openstack_database_node03_address}
- names:
- - ${_param:openstack_database_node03_hostname}
- - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
- mdb:
- address: ${_param:openstack_telemetry_address}
- names:
- - ${_param:openstack_telemetry_hostname}
- - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
- mdb01:
- address: ${_param:openstack_telemetry_node01_address}
- names:
- - ${_param:openstack_telemetry_node01_hostname}
- - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
- mdb02:
- address: ${_param:openstack_telemetry_node02_address}
- names:
- - ${_param:openstack_telemetry_node02_hostname}
- - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
- mdb03:
- address: ${_param:openstack_telemetry_node03_address}
- names:
- - ${_param:openstack_telemetry_node03_hostname}
- - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
- cmp001:
- address: ${_param:openstack_compute_node01_control_address}
- names:
- - ${_param:openstack_compute_node01_hostname}
- - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
- cmp002:
- address: ${_param:openstack_compute_node02_control_address}
- names:
- - ${_param:openstack_compute_node02_hostname}
- - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
gtw01:
address: ${_param:openstack_gateway_node01_address}
names:
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 67a5d3d5a..2ebdea8eb 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
@@ -1,24 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.rabbitmq.server.cluster
- - system.rabbitmq.server.vhost.openstack
- cluster.baremetal-mcp-ocata-ovs-ha
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 90
- cluster_vip_address: ${_param:openstack_message_queue_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: msg01
- cluster_node01_address: ${_param:openstack_message_queue_node01_address}
- cluster_node02_hostname: msg02
- cluster_node02_address: ${_param:openstack_message_queue_node02_address}
- cluster_node03_hostname: msg03
- cluster_node03_address: ${_param:openstack_message_queue_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
+ - cluster.baremetal-mcp-ocata-common.openstack_message_queue
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 c6a68fa29..12bd0df5f 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
@@ -1,42 +1,5 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.nginx.server.single
- - system.nginx.server.proxy.openstack_api
- - system.nginx.server.proxy.openstack_vnc
- - system.nginx.server.proxy.openstack_web
- - system.nginx.server.proxy.openstack.aodh
- - system.nginx.server.proxy.openstack.ceilometer
- - system.horizon.server.single
- - system.salt.minion.cert.proxy
- - system.sphinx.server.doc.reclass
- - service.keepalived.cluster.single
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard
- # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
-parameters:
- _param:
- keepalived_vip_interface: ${_param:single_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:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- system:
- package:
- libapache2-mod-wsgi:
- salt:
- minion:
- cert:
- proxy:
- alternative_names: "IP:${_param:openstack_proxy_address}"
- key_usage: 'digitalSignature, keyEncipherment'
+ - cluster.baremetal-mcp-ocata-common.openstack_proxy
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 4a72a61e6..5d198e45c 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
@@ -1,33 +1,4 @@
---
classes:
- - system.linux.system.repo.mcp.openstack
- - system.linux.system.repo.mcp.extra
- - system.mongodb.server.cluster
- - system.mongodb.server.database.ceilometer
- - system.ceilometer.server.backend.mongodb
- # - system.ceilometer.server.backend.influxdb
- # - system.heka.ceilometer_collector.single
- - system.ceilometer.server.cluster
- - system.aodh.server.cluster
- cluster.baremetal-mcp-ocata-ovs-ha.infra
-parameters:
- _param:
- keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
- keepalived_vip_virtual_router_id: 230
- cluster_vip_address: ${_param:openstack_telemetry_address}
- cluster_local_address: ${_param:single_address}
- cluster_node01_hostname: mdb01
- cluster_node01_address: ${_param:openstack_telemetry_node01_address}
- cluster_node02_hostname: mdb02
- cluster_node02_address: ${_param:openstack_telemetry_node02_address}
- cluster_node03_hostname: mdb03
- cluster_node03_address: ${_param:openstack_telemetry_node03_address}
- linux:
- network:
- interface:
- dhcp: ${_param:linux_dhcp_interface}
- single: ${_param:linux_single_interface}
- mongodb:
- server:
- logging:
- verbose: v
+ - cluster.baremetal-mcp-ocata-common.openstack_telemetry