diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha')
16 files changed, 276 insertions, 257 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml index 452062191..3966dae6c 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,23 +1,24 @@ +--- 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 + - 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 @@ -27,6 +28,7 @@ parameters: 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" linux: network: @@ -78,16 +80,16 @@ parameters: 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 + # 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 + - cluster.${_param:cluster_name}.openstack.control_init params: linux_system_codename: xenial openstack_control_node02: @@ -98,7 +100,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.${_param:cluster_name}.openstack.database_init + - cluster.${_param:cluster_name}.openstack.database_init params: linux_system_codename: xenial openstack_database_node02: @@ -111,7 +113,7 @@ parameters: name: ${_param:openstack_compute_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -123,7 +125,7 @@ parameters: name: ${_param:openstack_compute_node02_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial 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 efb288e77..b4cc054a2 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,16 +1,17 @@ +--- 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 + - 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 parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 cluster_name: baremetal-mcp-ocata-ovs-ha cluster_domain: ${_param:cluster_name}.local -# stacklight_environment: ${_param:cluster_domain} + # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master cluster_public_host: ${_param:openstack_proxy_address} infra_config_hostname: cfg01 @@ -54,6 +55,7 @@ parameters: 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: @@ -67,30 +69,30 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - ${_param:infra_config_hostname} - - ${_param:infra_config_hostname}.${_param:cluster_domain} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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 3e9879b43..9e023e33d 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,21 +1,22 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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 + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - 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 @@ -28,8 +29,8 @@ parameters: deploy_nic: enp6s0 salt: control: - size: #RAM 4096,8192,16384,32768,65536 - ##Default production sizing + size: # RAM 4096,8192,16384,32768,65536 + # Default production sizing openstack.control: cpu: 4 ram: 12288 @@ -50,31 +51,29 @@ parameters: 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 -# 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: - prx02: - provider: kvm03.${_param:cluster_domain} mdb01: image: ${_param:salt_control_xenial_image} mdb02: @@ -103,6 +102,7 @@ parameters: image: ${_param:salt_control_xenial_image} prx02: image: ${_param:salt_control_xenial_image} + provider: kvm03.${_param:cluster_domain} virt: nic: default: @@ -123,9 +123,9 @@ parameters: - ${_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 + cluster.readdir-optimize: 'On' + nfs.disable: 'On' + network.remote-dio: 'On' diagnostics.client-log-level: WARNING diagnostics.brick-log-level: WARNING linux: @@ -145,7 +145,7 @@ parameters: type: bridge name_servers: ${_param:opnfv_name_servers} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} noifupdown: true mgmt-vlan: enabled: true @@ -153,7 +153,7 @@ parameters: type: vlan name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} br-ctl: enabled: true type: bridge @@ -161,4 +161,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} 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 3a98fac2a..2922fa380 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,7 +1,8 @@ +--- classes: -- system.linux.system.repo.saltstack.xenial -- system.maas.region.single -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - system.linux.system.repo.saltstack.xenial + - system.maas.region.single + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: dhcp_interface: ens3 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml index e571689ef..0f7a36cf6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml @@ -1,4 +1,5 @@ +--- classes: -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-ovs-ha.infra -- cluster.baremetal-mcp-ocata-ovs-ha.openstack + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-ocata-ovs-ha.openstack 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 371928a81..23a8d46f3 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,5 +1,6 @@ +--- classes: -- cluster.baremetal-mcp-ocata-ovs-ha + - cluster.baremetal-mcp-ocata-ovs-ha parameters: linux: network: 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 fca40654a..ff97fe819 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,17 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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-ovs-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - 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-ovs-ha.infra parameters: _param: cluster_vip_address: ${_param:openstack_control_address} @@ -39,6 +40,7 @@ parameters: 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: @@ -72,21 +74,21 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} + - ${_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} + - ${_param:mgmt_nic} tenant-vlan: enabled: true proto: manual type: vlan name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} use_interfaces: - - ${_param:tenant_nic} + - ${_param:tenant_nic} br-ctl: enabled: true type: bridge @@ -94,7 +96,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge @@ -111,6 +113,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_nic} + - ${_param:external_nic} use_ovs_ports: - - float-to-ex + - 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 1711ab0fe..f0c03cc0e 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,26 +1,27 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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 + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - 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: ens3 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml index e759c0c8d..79c387940 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml @@ -1,9 +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 + - 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-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml index 39cc073a6..f2e010da4 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,6 +1,7 @@ +--- classes: -- system.horizon.server.single -- cluster.baremetal-mcp-ocata-ovs-ha + - system.horizon.server.single + - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: horizon_site_branding: 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 4cb7397f2..b8a43d814 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,19 +1,20 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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 + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - 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: ens3 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml index b16f05593..5dcb9c9e1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml @@ -1,2 +1,3 @@ +--- classes: -- system.mysql.client.single + - system.mysql.client.single 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 eff56516d..7ce282be5 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,8 +1,10 @@ +--- 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} @@ -77,17 +79,17 @@ parameters: openstack_region: RegionOne admin_email: root@localhost - ##Neutron osv/nodvr - neutron_control_dvr: False + # Neutron osv/nodvr + neutron_control_dvr: 'False' neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: True + neutron_l3_ha: 'True' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: True + neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -182,129 +184,129 @@ parameters: 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} + # 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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_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} + - ${_param:openstack_gateway_node02_hostname} + - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} 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 881644bf4..66b58221c 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,10 +1,11 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.rabbitmq.server.cluster -- system.rabbitmq.server.vhost.openstack -- cluster.baremetal-mcp-ocata-ovs-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - system.rabbitmq.server.cluster + - system.rabbitmq.server.vhost.openstack + - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: keepalived_vip_interface: ens3 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 5e9a2c544..e948d93ad 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,20 +1,21 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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 + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - 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: ens3 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 0e3c7bdae..4389a4918 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,15 +1,16 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- 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 + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.system.repo.saltstack.xenial + - 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: ens3 |