diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
96 files changed, 126 insertions, 394 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index 57793d934..37e4ad7ea 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -1,4 +1,4 @@ -baremetal-mcp-ocata-common/infra/kvm_init.yml -baremetal-mcp-ocata-common/openstack_compute_init.yml -baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml -baremetal-mcp-ocata-*/openstack/compute_init.yml +baremetal-mcp-*/infra/kvm_init.yml +baremetal-mcp-*/openstack_compute_init.yml +baremetal-mcp-*-ovs-dpdk-ha/infra/config_init.yml +baremetal-mcp-*/openstack/compute_init.yml diff --git a/mcp/reclass/classes/cluster/README.rst b/mcp/reclass/classes/cluster/README.rst index 3fec9b0f2..dc09cfbac 100644 --- a/mcp/reclass/classes/cluster/README.rst +++ b/mcp/reclass/classes/cluster/README.rst @@ -10,14 +10,14 @@ Overview #. Common classes (baremetal + virtual) - - all-mcp-ocata-common + - all-mcp-arch-common #. Common classes (specific to either baremetal or virtual deploys) - - baremetal-mcp-ocata-common - - virtual-mcp-ocata-common + - baremetal-mcp-<release>-common-ha + - virtual-mcp-<release>-common-noha #. Cluster specific classes - - baremetal-mcp-ocata-* - - virtual-mcp-ocata-* + - baremetal-mcp-<release>-*-{ha,noha} + - virtual-mcp-<release>-*-{ha,noha} diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml index b5b78ec08..0350afa3d 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/aarch64/init.yml @@ -8,7 +8,7 @@ --- parameters: _param: - salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img + salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) opnfv_fn_vm_primary_interface: enp1s0 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml index 731fe6ed6..f09ee5db1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml @@ -7,4 +7,5 @@ ############################################################################## --- classes: - - system.mysql.client.single + - cluster.all-mcp-arch-common.arch + - cluster.all-mcp-arch-common.opnfv diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore index bf6a84be7..bf6a84be7 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/.gitignore diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml index 3f57713fe..28dcdcd5b 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/init.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common.arch - - cluster.all-mcp-ocata-common.opnfv + - cluster.all-mcp-arch-common.opnfv.runtime + - cluster.all-mcp-arch-common.opnfv.pod_config diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml index d72df2eb6..d72df2eb6 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example index e5b852f32..e5b852f32 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/pod_config.yml.example diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml index 4fd9e0368..4fd9e0368 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template index 1445917e6..1445917e6 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/opnfv/runtime.yml.template diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml index a9a774bbb..a9a774bbb 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/x86_64/init.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml deleted file mode 100644 index aa780e631..000000000 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.all-mcp-ocata-common.opnfv.runtime - - cluster.all-mcp-ocata-common.opnfv.pod_config diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml index e0f9a2a94..f2a4dbe43 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml @@ -97,7 +97,7 @@ parameters: # - system.kibana.client.single openstack_control_node01: classes: - - cluster.baremetal-mcp-ocata-common.openstack_control_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_control_init params: linux_system_codename: xenial openstack_control_node02: @@ -108,7 +108,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.${_param:cluster_name}.openstack.database_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_database_init params: linux_system_codename: xenial openstack_database_node02: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml index 3d3f8df62..e20322a2e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml @@ -8,9 +8,9 @@ --- classes: - system.linux.system.single - - cluster.all-mcp-ocata-common - # - cluster.baremetal-mcp-ocata-common.stacklight - # - cluster.baremetal-mcp-ocata-common.stacklight.client + - cluster.all-mcp-arch-common + # - cluster.baremetal-mcp-ocata-common-ha.stacklight + # - cluster.baremetal-mcp-ocata-common-ha.stacklight.client parameters: _param: apt_mk_version: nightly diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml index ce7fc8561..39ced154b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml @@ -23,7 +23,7 @@ classes: # - 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-common.infra.kvm_init + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm_init parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2 index d14f90582..d14f90582 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml index e8c2965f7..e8c2965f7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml index e07e61139..47ef1f79f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml @@ -18,7 +18,7 @@ classes: - system.cinder.volume.single - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster - - cluster.baremetal-mcp-ocata-common.openstack_compute_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute_init parameters: _param: cluster_vip_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2 index 687777b2c..687777b2c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml index ce82807ce..ce82807ce 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml index deb4cd7e9..deb4cd7e9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml index 7ed588d9b..7ed588d9b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml index 731fe6ed6..731fe6ed6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml index 49140f803..49140f803 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml index 88affb84a..88affb84a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml index 84845658c..031955606 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml @@ -36,7 +36,7 @@ parameters: linux: network: interface: - dhcp: + dhcp_int: enabled: true type: eth proto: dhcp @@ -46,7 +46,7 @@ parameters: address: ${_param:opnfv_net_mcpcontrol} netmask: ${_param:opnfv_net_mcpcontrol_mask} gateway: ${_param:opnfv_infra_maas_node01_deploy_address} - single: + single_int: enabled: true type: eth proto: static @@ -58,7 +58,7 @@ parameters: address: 0.0.0.0 netmask: 0.0.0.0 gateway: ${_param:opnfv_net_public_gw} - control: + control_int: enabled: true type: eth proto: static diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml index c52b5ed79..c52b5ed79 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml deleted file mode 100644 index 5b0d91381..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml +++ /dev/null @@ -1,174 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -parameters: - _param: - haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 - haproxy: - proxy: - listen: - cinder_api: - type: openstack-service - service_name: cinder - binds: - - address: ${_param:cluster_vip_address} - port: 8776 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: ${_param:haproxy_check} - glance_api: - type: openstack-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9292 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: ${_param:haproxy_check} - glance_registry_api: - type: general-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9191 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: ${_param:haproxy_check} - glare: - type: general-service - service_name: glare - binds: - - address: ${_param:cluster_vip_address} - port: 9494 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: ${_param:haproxy_check} - heat_cloudwatch_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8003 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} - heat_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8004 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: ${_param:haproxy_check} - heat_cfn_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: ${_param:haproxy_check} - keystone_public_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 5000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: ${_param:haproxy_check} - keystone_admin_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 35357 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: ${_param:haproxy_check} - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: ${_param:haproxy_check} - nova_placement_api: - mode: http - binds: - - address: ${_param:cluster_vip_address} - port: 8778 - options: - - httpclose - - httplog - health-check: - http: - options: - - expect status 401 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: ${_param:haproxy_check} - nova_ec2_api: - type: general-service - service_name: nova - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8773 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: ${_param:haproxy_check} - nova_api: - type: openstack-service - service_name: nova - binds: - - address: ${_param:cluster_vip_address} - port: 8774 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: ${_param:haproxy_check} - nova_metadata_api: - type: openstack-service - binds: - - address: ${_param:cluster_vip_address} - port: 8775 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: ${_param:haproxy_check} 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 0d2c5a303..7733008b2 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 @@ -8,7 +8,7 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-common-ha.infra.config - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: reclass: 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 efcf1a4e7..7cc82dd31 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-common-ha.infra - cluster.baremetal-mcp-ocata-odl-ha.openstack parameters: _param: 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 d7bbadd75..01e4a6b99 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: salt: 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 5b842bba9..c51650ac8 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-common-ha.infra.maas - cluster.baremetal-mcp-ocata-odl-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml index bd8e46907..474ee6d70 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-odl-ha.openstack 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 4418b0fde..3c93972c7 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 @@ -8,7 +8,7 @@ --- classes: - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-odl-ha.infra - system.neutron.gateway.opendaylight.single 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 210da2ad5..9f729f915 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 @@ -8,7 +8,7 @@ --- classes: - system.neutron.control.opendaylight.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: neutron: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml deleted file mode 100644 index deb4cd7e9..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -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-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml index fc38aada6..f6e46d788 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml deleted file mode 100644 index 731fe6ed6..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml +++ /dev/null @@ -1,10 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - system.mysql.client.single 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 9a04c84d0..fa1ed1072 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_init parameters: _param: # opendaylight options 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 5757db3a6..78d6e8ec6 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_message_queue + - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-odl-ha 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 a516803fa..9549a63aa 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: nginx: 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 fd4f7e8d1..32ebb05e9 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-odl-ha.infra 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 149fff5ff..4a7e4cdcb 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 @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-common-ha.infra.config - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init 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 60278a5b3..9659c0b42 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-common-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack parameters: _param: 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 f7a8fe352..e4506ca6a 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra 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 3ec33c39a..f4e71ed5b 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-common-ha.infra.maas - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml index cd8eebae5..5f05c05b8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack 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 e610dc930..98b182ce0 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 @@ -8,7 +8,7 @@ --- classes: - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - system.neutron.compute.nfv.dpdk parameters: 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 dddae33c4..9a98ba9c1 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 @@ -8,7 +8,7 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: neutron: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml deleted file mode 100644 index deb4cd7e9..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -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-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml index e76b20ae6..fa65fbced 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-ovs-dpdk-ha 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 5e855ac4f..4ef7ffc96 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vlan" 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 a01eda9a4..fb3312417 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_message_queue + - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-ovs-dpdk-ha 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 63ff2c87e..1fcde7ecd 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra 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 d38cc0d0b..de41a81d3 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra 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 c325246f4..e71f638b0 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-common-ha.infra.config - cluster.baremetal-mcp-ocata-ovs-ha.infra 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 a15355b4c..044c05e0e 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-common-ha.infra - cluster.baremetal-mcp-ocata-ovs-ha.openstack parameters: _param: 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 51bf6ae42..ea15224ab 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - cluster.baremetal-mcp-ocata-ovs-ha.infra 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 9121299bd..692f74106 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-common-ha.infra.maas - cluster.baremetal-mcp-ocata-ovs-ha.infra 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 b15c8c3a8..1c2952456 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 @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-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/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index 9ed3a80ea..79f297fe4 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: 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 790c6d9a3..6d120935a 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 @@ -8,5 +8,5 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-ovs-ha.infra 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 deleted file mode 100644 index deb4cd7e9..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -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-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index fae7c5bc3..91ae84cb3 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-ovs-ha 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 deleted file mode 100644 index 731fe6ed6..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml +++ /dev/null @@ -1,10 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - 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 27fd40480..9ccbc08a9 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 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" 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 986422baf..3ce561374 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_message_queue + - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-ovs-ha 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 9288e6f81..ff6246b75 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-ha.infra 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 6b2349e25..b8e857d8d 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 @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/haproxy_openstack_api.yml index 649b75c8c..649b75c8c 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/haproxy_openstack_api.yml diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml index 3c3d5260a..3c3d5260a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml index 2385411b4..2385411b4 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml index 9540b9436..9540b9436 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml index ad0675475..35c23fef7 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml @@ -62,12 +62,6 @@ parameters: device: ${_param:openstack_control_address}:/srv/nova/instances linux: system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com kernel: sysctl: vm.dirty_ratio: 10 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml index ab5833910..98256745f 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml @@ -8,8 +8,6 @@ --- classes: - system.linux.system.lowmem - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - service.nfs.server - system.mongodb.server.single - system.mongodb.server.database.ceilometer @@ -45,7 +43,7 @@ classes: - system.aodh.server.single - system.horizon.server.single - service.haproxy.proxy.single - - cluster.virtual-mcp-ocata-common.haproxy_openstack_api + - cluster.virtual-mcp-pike-common-noha.haproxy_openstack_api parameters: _param: linux_system_codename: xenial @@ -73,17 +71,6 @@ parameters: keystone: server: admin_email: ${_param:admin_email} - pkgs: - - keystone - - python-keystone - - python-keystoneclient - - python-psycopg2 - - python-mysqldb - - python-six - - python-memcache - - python-openstackclient - - gettext-base - - python-pycadf glance: server: storage: @@ -102,6 +89,13 @@ parameters: novncproxy_port: 6080 vncproxy_url: http://${_param:cluster_vip_address}:6080 workers: 1 + pkgs: + - nova-api + - nova-conductor + - nova-consoleauth + - nova-novncproxy + - nova-scheduler + - python-novaclient horizon: server: # yamllint disable-line rule:truthy diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml index 4ed8eed77..9822de7d3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml @@ -6,9 +6,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- -classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra parameters: _param: primary_interface: ${_param:opnfv_fn_vm_secondary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml index 81f050f89..cf35a2b20 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml @@ -8,7 +8,7 @@ --- parameters: _param: - openstack_version: ocata + openstack_version: pike apt_mk_version: nightly mcp_repo_version: 1.1 openstack_region: RegionOne @@ -95,6 +95,12 @@ parameters: aodh_service_host: ${_param:cluster_local_address} linux: system: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" + architectures: amd64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com kernel: sysctl: net.ipv4.tcp_congestion_control: yeah diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml index 24c302869..19dc9feb9 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml @@ -8,8 +8,8 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.virtual-mcp-ocata-common.infra.config - - cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-pike-common-noha.infra.config + - cluster.virtual-mcp-pike-odl-noha parameters: reclass: storage: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml index 980ea1b0b..6a4ef9a48 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml @@ -8,13 +8,13 @@ --- classes: - system.linux.system.single - - cluster.all-mcp-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-odl-router.openstack + - cluster.all-mcp-arch-common + - cluster.virtual-mcp-pike-common-noha.init_options + - cluster.virtual-mcp-pike-common-noha.infra + - cluster.virtual-mcp-pike-odl-noha.openstack parameters: _param: - cluster_domain: virtual-mcp-ocata-odl-router.local - cluster_name: virtual-mcp-ocata-odl-router + cluster_domain: virtual-mcp-pike-odl-noha.local + cluster_name: virtual-mcp-pike-odl-noha opendaylight_service_host: 172.16.10.111 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml index f75cd3300..f4404a69b 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml @@ -10,7 +10,7 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.opendaylight.server.single - - cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-pike-odl-noha parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml index f6f26be67..6b2ca8e86 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-pike-common-noha.openstack_compute + - cluster.virtual-mcp-pike-odl-noha parameters: opendaylight: client: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml index a0ace9601..ede9d4c5d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml @@ -8,8 +8,8 @@ --- classes: - system.neutron.control.opendaylight.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-pike-common-noha.openstack_control + - cluster.virtual-mcp-pike-odl-noha parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml index 231413a19..47d11cd5d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_gateway + - cluster.virtual-mcp-pike-common-noha.openstack_gateway - system.neutron.gateway.opendaylight.single - - cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-pike-odl-noha parameters: _param: neutron_agents: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml index 5be63e51b..cbf4e692e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml @@ -7,19 +7,12 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-pike-common-noha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" opendaylight_router: odl-router_v2 linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com network: host: odl01: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml index ef0735743..70dcd2f8a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.infra.config - - cluster.virtual-mcp-ocata-ovs-dpdk + - cluster.virtual-mcp-pike-common-noha.infra.config + - cluster.virtual-mcp-pike-ovs-dpdk-noha parameters: reclass: storage: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml index 588e8bee0..e6a7da4df 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml @@ -8,12 +8,12 @@ --- classes: - system.linux.system.single - - cluster.all-mcp-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-ovs-dpdk.openstack + - cluster.all-mcp-arch-common + - cluster.virtual-mcp-pike-common-noha.init_options + - cluster.virtual-mcp-pike-common-noha.infra + - cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack parameters: _param: - cluster_domain: virtual-mcp-ocata-ovs-dpdk.local - cluster_name: virtual-mcp-ocata-ovs-dpdk + cluster_domain: virtual-mcp-pike-ovs-dpdk-noha.local + cluster_name: virtual-mcp-pike-ovs-dpdk-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml index ba6577e0d..0f53477eb 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml @@ -7,12 +7,10 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.nova.compute.nfv.hugepages - system.neutron.compute.nfv.dpdk - - cluster.virtual-mcp-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-ovs-dpdk + - cluster.virtual-mcp-pike-common-noha.openstack_compute + - cluster.virtual-mcp-pike-ovs-dpdk-noha parameters: neutron: compute: @@ -20,6 +18,11 @@ parameters: tenant_network_types: ${_param:neutron_tenant_network_types} linux: network: + dpdk_pkgs: + - dpdk + - dpdk-dev + - dpdk-igb-uio-dkms + - dpdk-rte-kni-dkms interface: dpdk0: name: ${_param:dpdk0_name} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml index 780f66427..4dbaae829 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml @@ -8,8 +8,8 @@ --- classes: - system.neutron.control.openvswitch.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-ovs-dpdk + - cluster.virtual-mcp-pike-common-noha.openstack_control + - cluster.virtual-mcp-pike-ovs-dpdk-noha parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml index 4f215e807..ec943a857 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_gateway + - cluster.virtual-mcp-pike-common-noha.openstack_gateway - service.neutron.gateway.single - - cluster.virtual-mcp-ocata-ovs-dpdk + - cluster.virtual-mcp-pike-ovs-dpdk-noha parameters: neutron: gateway: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml index c27f73b05..5445a07ea 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-pike-common-noha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vlan" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml index 8505e3503..dcf87774c 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.infra.config - - cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-pike-common-noha.infra.config + - cluster.virtual-mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml index 56e676ba9..d217a6978 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml @@ -8,12 +8,12 @@ --- classes: - system.linux.system.single - - cluster.all-mcp-ocata-common - - cluster.virtual-mcp-ocata-common.init_options - - cluster.virtual-mcp-ocata-common.infra - - cluster.virtual-mcp-ocata-ovs.openstack + - cluster.all-mcp-arch-common + - cluster.virtual-mcp-pike-common-noha.init_options + - cluster.virtual-mcp-pike-common-noha.infra + - cluster.virtual-mcp-pike-ovs-noha.openstack parameters: _param: - cluster_domain: virtual-mcp-ocata-ovs.local - cluster_name: virtual-mcp-ocata-ovs + cluster_domain: virtual-mcp-pike-ovs-noha.local + cluster_name: virtual-mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml index c9fee8842..11e0d522e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_compute - - cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-pike-common-noha.openstack_compute + - cluster.virtual-mcp-pike-ovs-noha parameters: linux: network: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml index 17250c338..4e03c4b7e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml @@ -8,5 +8,5 @@ --- classes: - system.neutron.control.openvswitch.single - - cluster.virtual-mcp-ocata-common.openstack_control - - cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-pike-common-noha.openstack_control + - cluster.virtual-mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml index 50c0f6e4d..0eec95cc4 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_gateway + - cluster.virtual-mcp-pike-common-noha.openstack_gateway - service.neutron.gateway.single - - cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-pike-ovs-noha parameters: linux: network: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml index 4b083944a..19126f89d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-pike-common-noha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" |