From df50479e0ba785ec90469457a64a7903451e73e8 Mon Sep 17 00:00:00 2001 From: Johannes Grassler Date: Mon, 9 Sep 2019 14:14:10 +0200 Subject: [PATCH 1/3] Create dedicated Cloud 8 upgrade QA scenarios This commit creates dedicated Cloud 8 scenarios for the Cloud 8 to Cloud 9 upgrade. As of this commit they are a unmodified copy of the regular Cloud 8 scenarios (for diffability, they will be modified to account for deprecations in a later commit). --- .../cloud8-upgrade/cloud8-2nodes-default.yml | 183 +++++++++++ .../cloud8-5nodes-compute-ha.yml | 235 ++++++++++++++ .../cloud8-upgrade/cloud8-5nodes-default.yml | 228 +++++++++++++ .../qa/no-ssl/qa-scenario-1a.yaml | 172 ++++++++++ .../qa/no-ssl/qa-scenario-1b.yaml | 190 +++++++++++ .../qa/no-ssl/qa-scenario-2a.yaml | 265 +++++++++++++++ .../qa/no-ssl/qa-scenario-2b.yaml | 218 +++++++++++++ .../qa/no-ssl/qa-scenario-2c.yaml | 183 +++++++++++ .../qa/no-ssl/qa-scenario-3.yaml | 205 ++++++++++++ .../qa/no-ssl/qa-scenario-6a.yaml | 182 +++++++++++ .../qa/no-ssl/qa-scenario-8a.yaml | 223 +++++++++++++ .../qa/no-ssl/qa-scenario-8b.yaml | 237 ++++++++++++++ .../qa/no-ssl/qa-scenario-9.yaml | 178 ++++++++++ .../qa/ssl-insecure/qa-scenario-1a.yaml | 241 ++++++++++++++ .../qa/ssl-insecure/qa-scenario-1b.yaml | 260 +++++++++++++++ .../qa/ssl-insecure/qa-scenario-2a.yaml | 305 ++++++++++++++++++ .../qa/ssl-insecure/qa-scenario-2b.yaml | 272 ++++++++++++++++ .../qa/ssl-insecure/qa-scenario-2c.yaml | 212 ++++++++++++ .../qa/ssl-insecure/qa-scenario-3.yaml | 245 ++++++++++++++ .../qa/ssl-insecure/qa-scenario-6a.yaml | 235 ++++++++++++++ .../qa/ssl-insecure/qa-scenario-8a.yaml | 259 +++++++++++++++ .../qa/ssl-insecure/qa-scenario-8b.yaml | 279 ++++++++++++++++ .../cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml | 245 ++++++++++++++ 23 files changed, 5252 insertions(+) create mode 100644 scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml create mode 100644 scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml create mode 100644 scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8b.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8a.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8b.yaml create mode 100644 scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml diff --git a/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml b/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml new file mode 100644 index 0000000000..555a1abc0a --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml @@ -0,0 +1,183 @@ +--- +proposals: +- barclamp: database + attributes: + deployment: + elements: + database-server: + - @@controller@@ +- barclamp: rabbitmq + attributes: + trove: + enabled: true + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - @@controller@@ +- barclamp: keystone + attributes: + api: + region: 'CustomRegion' + deployment: + elements: + keystone-server: + - @@controller@@ +- barclamp: swift + attributes: + zones: 1 + replicas: 1 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: + - @@controller@@ + swift-proxy: + - @@controller@@ + swift-ring-compute: + - @@controller@@ + swift-storage: + - @@compute-kvm@@ +- barclamp: glance + attributes: + deployment: + elements: + glance-server: + - @@controller@@ +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + deployment: + elements: + manila-server: + - @@controller@@ + manila-share: + - @@compute-kvm@@ + - @@controller@@ +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: default + raw: + volume_name: cinder-volumes + cinder_raw_method: first + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + deployment: + elements: + cinder-controller: + - @@controller@@ + cinder-volume: + - @@compute-kvm@@ + - @@controller@@ +- barclamp: neutron + attributes: + ml2_type_drivers: + - gre + - vxlan + - vlan + deployment: + elements: + neutron-server: + - @@controller@@ + neutron-network: + - @@controller@@ +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - @@controller@@ + nova-controller: + - @@controller@@ + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute-kvm@@ + nova-compute-qemu: [] + nova-compute-xen: [] +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - @@controller@@ +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - @@controller@@ +- barclamp: barbican + deployment: + elements: + barbican-controller: + - @@controller@@ +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - @@compute-kvm@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - @@controller@@ + ceilometer-server: + - @@controller@@ + ceilometer-swift-proxy-middleware: + - @@controller@@ +- barclamp: trove + attributes: + deployment: + elements: + trove-server: + - @@controller@@ +- barclamp: magnum + attributes: + cert: + cert_manager_type: barbican + deployment: + elements: + magnum-server: + - @@controller@@ +- barclamp: sahara + attributes: + deployment: + elements: + sahara-server: + - @@controller@@ +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - @@controller@@ diff --git a/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml new file mode 100644 index 0000000000..bf20bf2fea --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml @@ -0,0 +1,235 @@ +--- +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: libvirt + libvirt: + hypervisor_ip: ##hypervisor_ip## + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + pacemaker-remote: + - @@compute1@@ + - @@compute2@@ +- barclamp: database + attributes: + sql_engine: mysql + deployment: + elements: + database-server: + - cluster:services +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services +- barclamp: keystone + attributes: + api: + region: 'CustomRegion' + deployment: + elements: + keystone-server: + - cluster:services +- barclamp: swift + attributes: + zones: 1 + replicas: 2 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - @@controller1@@ + swift-storage: + - @@controller1@@ + - @@controller2@@ +- barclamp: glance + attributes: + default_store: swift + deployment: + elements: + glance-server: + - cluster:services +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: default + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - @@controller1@@ + - @@controller2@@ +- barclamp: neutron + attributes: + ml2_type_drivers: + - gre + - vxlan + - vlan + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - @@controller1@@ + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - remotes:services + nova-compute-qemu: [] + nova-compute-xen: [] +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - cluster:services +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services +- barclamp: barbican + deployment: + elements: + barbican-controller: + - cluster:services +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - @@controller1@@ + - @@controller2@@ +- barclamp: aodh + attributes: + deployment: + elements: + aodh-server: + - cluster:services +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - @@controller1@@ + - @@controller2@@ +- barclamp: trove + attributes: + deployment: + elements: + trove-server: + - @@controller1@@ +- barclamp: magnum + attributes: + cert: + cert_manager_type: barbican + deployment: + elements: + magnum-server: + - cluster:services +- barclamp: sahara + attributes: + deployment: + elements: + sahara-server: + - cluster:services +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml new file mode 100644 index 0000000000..2bde382755 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml @@ -0,0 +1,228 @@ +--- +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + @@controller1@@: + devices: + - "##sbd_device_services_controller1##" + @@controller2@@: + devices: + - "##sbd_device_services_controller2##" + @@controller3@@: + devices: + - "##sbd_device_services_controller3##" + watchdog_module: softdog + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ +- barclamp: database + attributes: + sql_engine: mysql + deployment: + elements: + database-server: + - cluster:services +- barclamp: rabbitmq + attributes: + trove: + enabled: true + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services +- barclamp: keystone + attributes: + api: + region: 'CustomRegion' + deployment: + elements: + keystone-server: + - cluster:services +- barclamp: swift + attributes: + zones: 1 + replicas: 2 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - @@controller1@@ + swift-storage: + - @@compute-kvm1@@ + - @@compute-kvm2@@ +- barclamp: glance + attributes: + default_store: swift + deployment: + elements: + glance-server: + - cluster:services +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: default + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - @@controller1@@ + - @@controller2@@ +- barclamp: neutron + attributes: + ml2_type_drivers: + - gre + - vxlan + - vlan + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute-kvm1@@ + - @@compute-kvm2@@ + nova-compute-qemu: [] + nova-compute-xen: [] +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - cluster:services +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services +- barclamp: barbican + deployment: + elements: + barbican-controller: + - cluster:services +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - @@compute-kvm1@@ + - @@compute-kvm2@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - @@controller1@@ + - @@controller2@@ +- barclamp: aodh + attributes: + deployment: + elements: + aodh-server: + - cluster:services +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - @@controller1@@ + - @@controller2@@ +- barclamp: trove + attributes: + deployment: + elements: + trove-server: + - @@controller1@@ +- barclamp: magnum + attributes: + cert: + cert_manager_type: barbican + deployment: + elements: + magnum-server: + - cluster:services +- barclamp: sahara + attributes: + deployment: + elements: + sahara-server: + - cluster:services +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1a.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1a.yaml new file mode 100644 index 0000000000..f12107730d --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1a.yaml @@ -0,0 +1,172 @@ +--- +# 1a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" +- barclamp: database + deployment: + elements: + database-server: + - cluster:services +- barclamp: rabbitmq + attributes: + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services +- barclamp: keystone + attributes: + deployment: + elements: + keystone-server: + - cluster:services +- barclamp: swift + attributes: + replicas: 2 + cluster_hash: 181d283256 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@storage-swift1@@" + - "@@storage-swift2@@" +- barclamp: glance + attributes: + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + nova-compute-qemu: [] + nova-compute-xen: [] +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - cluster:services +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services +- barclamp: barbican + attributes: + deployment: + elements: + barbican-controller: + - "@@controller1@@" +- barclamp: sahara + attributes: + deployment: + elements: + sahara-server: + - "@@controller1@@" +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml new file mode 100644 index 0000000000..9d472e5152 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml @@ -0,0 +1,190 @@ +--- +#1b - 8 nodes: HA (IPMI 1 x 3), KVM x 2, Xen x 2 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: + - "@@controller1@@" + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + +- barclamp: glance + attributes: + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + nova-compute-qemu: [] + nova-compute-xen: + - "@@compute-xen1@@" + - "@@compute-xen2@@" + +- barclamp: horizon + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: tempest + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml new file mode 100644 index 0000000000..1a8b02cf20 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml @@ -0,0 +1,265 @@ +--- +# 2a - 8 nodes, HA (SBD 3x2), KVM x 1 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@controller1@@": + devices: + - "@@sbd_device_services@@" + "@@controller2@@": + devices: + - "@@sbd_device_services@@" + per_node: + nodes: + "@@controller1@@": + params: '' + "@@controller2@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + +- barclamp: pacemaker + name: data + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@data1@@": + devices: + - "@@sbd_device_data@@" + "@@data2@@": + devices: + - "@@sbd_device_data@@" + per_node: + nodes: + "@@data1@@": + params: '' + "@@data2@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@data1@@" + - "@@data2@@" + hawk-server: + - "@@data1@@" + - "@@data2@@" + +- barclamp: pacemaker + name: network + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@network1@@": + devices: + - "@@sbd_device_network@@" + "@@network2@@": + devices: + - "@@sbd_device_network@@" + per_node: + nodes: + "@@network1@@": + params: '' + "@@network2@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@network1@@" + - "@@network2@@" + hawk-server: + - "@@network1@@" + - "@@network2@@" + +- barclamp: database + attributes: + sql_engine: postgresql + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + deployment: + elements: + database-server: + - cluster:data + +- barclamp: rabbitmq + attributes: + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:data + +- barclamp: keystone + attributes: + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: + - "@@controller1@@" + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@controller2@@" + - "@@compute-kvm@@" + +- barclamp: glance + attributes: + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + use_lbaas: false + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:network + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm@@" + nova-compute-qemu: [] + nova-compute-xen: [] + +# Because neutron and nova are deployed on different clusters, we need +# to commit neutron proposal again after nova to pick up the nova authentication +- barclamp: neutron + attributes: + use_lbaas: true + +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: netapp + backend_name: netapp1 + netapp: + netapp_storage_family: ontap_cluster + netapp_server_hostname: ##netapp_server## + netapp_server_port: 80 + netapp_login: admin + netapp_password: ##netapp_password## + netapp_vserver: ##netapp_vserver## + netapp_transport_type: http + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - "@@data1@@" + - "@@data2@@" + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml new file mode 100644 index 0000000000..4b654f6e1a --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml @@ -0,0 +1,218 @@ +--- +# Placeholders for node devices must be replaced by some real values +# 2b - 8 nodes, HA (IPMI - stonith x 3), KVM x 1, ESXi x 1 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + default_store: vsphere + vsphere: + host: "@@vcenter_ip@@" + user: "@@vcenter_user@@" + password: "@@vcenter_password@@" + datastores: + - "Datacenter:datastore1" + insecure: true + deployment: + elements: + glance-server: + - cluster:services + +# vcenter credentials must be replaced by some real values +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + - backend_driver: vmware + backend_name: vmware + vmware: + volume_folder: cinder-volume + host: "@@vcenter_ip@@" + user: "@@vcenter_user@@" + password: "@@vcenter_password@@" + cluster_name: + - Openstack + insecure: true + ca_file: "" + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - openvswitch + - vmware_dvs + ml2_type_drivers: + - vlan + ml2_type_drivers_default_provider_network: vlan + ml2_type_drivers_default_tenant_network: vlan + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + vcenter: + clusters: + - Openstack + host: "@@vcenter_ip@@" + user: "@@vcenter_user@@" + password: "@@vcenter_password@@" + datastore: datastore1 + insecure: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@computekvm1@@" + - "@@computekvm2@@" + nova-compute-qemu: [] + nova-compute-xen: [] + nova-compute-vmware: + - "@@computevmw@@" + +- barclamp: horizon + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + deployment: + elements: + ceilometer-agent: + - "@@computekvm1@@" + - "@@computevmw@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: tempest + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml new file mode 100644 index 0000000000..2e0b66593e --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml @@ -0,0 +1,183 @@ +--- +# 2c - 7 nodes: HA x 3 SBD, KVM x 3, SES x 1 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + @@controller1@@: + devices: + - "@@sbd_device_services@@" + @@controller2@@: + devices: + - "@@sbd_device_services@@" + @@controller3@@: + devices: + - "@@sbd_device_services@@" + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + +- barclamp: database + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + default_store: rbd + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: rbd + backend_name: rbd + rbd: + use_crowbar: false + config_file: "/etc/ceph/ceph.conf" + admin_keyring: "/etc/ceph/ceph.client.admin.keyring" + pool: volumes + user: cinder + secret_uuid: '' + flatten_volume_from_snapshot: false + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: ceph + shares: + - backend_driver: cephfs + backend_name: cephfs-backend + cephfs: + use_crowbar: false + cephfs_conf_path: "/etc/ceph/ceph.conf" + cephfs_auth_id: manila + cephfs_cluster_name: ceph + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - cluster:services + +- barclamp: tempest + attributes: + manila: + run_snapshot_tests: false + enable_protocols: cephfs + enable_ip_rules_for_protocols: "" + enable_cert_rules_for_protocols: "" + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml new file mode 100644 index 0000000000..9d54e7d5da --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml @@ -0,0 +1,205 @@ +--- +# 3 - 7 nodes: HA IMPI 1 x 3, KVM x 3 +proposals: +- barclamp: nfs_client + name: glance + attributes: + exports: + glance: + nfs_server: ##shared_nfs_for_glance## + export: ##shared_nfs_export_for_glance## + mount_path: "/images" + deployment: + elements: + nfs-client: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + enabled: false + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + pacemaker-remote: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + +- barclamp: database + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + + +- barclamp: keystone + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + filesystem_store_datadir: "/images" + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: default + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - remotes:services + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml new file mode 100644 index 0000000000..9815a9869a --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml @@ -0,0 +1,182 @@ +--- +# 6a - 7 nodes: HA IMPI 1 x 3, KVM x 4 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + "@@controller1@@": + devices: + - '' + "@@controller2@@": + devices: + - '' + "@@controller3@@": + devices: + - '' + per_node: + nodes: + "@@controller1@@": + params: '' + "@@controller2@@": + params: '' + "@@controller3@@": + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: nfs_client + name: glance + attributes: + exports: + images: + nfs_server: ##nfs_server## + export: ##nfs_export## + mount_path: "/images" + deployment: + elements: + nfs-client: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + filesystem_store_datadir: "/images" + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: local_file + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - "@@controller3@@" + - "@@controller1@@" + - "@@controller2@@" + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-kvm: + - "@@kvm1@@" + - "@@kvm2@@" + - "@@kvm3@@" + - "@@kvm4@@" + +- barclamp: horizon + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + deployment: + elements: + ceilometer-agent: + - "@@kvm2@@" + - "@@kvm1@@" + - "@@kvm3@@" + - "@@kvm4@@" + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + +- barclamp: magnum + attributes: + trustee: + domain_name: magnum + domain_admin_name: magnum_domain_admin + deployment: + elements: + magnum-server: + - "@@controller1@@" #TODO Cluster will be enabled when implementation done cluster - cluster:services + +- barclamp: tempest + attributes: + magnum: + flavor_id: m1.smaller # required by function oncontroller_magnum_service_setup in qa_crowbarsetup + master_flavor_id: m2.smaller # required by function oncontroller_magnum_service_setup in qa_crowbarsetup + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8a.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8a.yaml new file mode 100644 index 0000000000..b28ee056b5 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8a.yaml @@ -0,0 +1,223 @@ +--- +# 8a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift, Monasca +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + cluster_hash: 181d283256 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@storage-swift1@@" + - "@@storage-swift2@@" + +- barclamp: glance + attributes: + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm@@" + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + attributes: + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm@@" + - "@@monasca-server@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: monasca + attributes: + deployment: + elements: + monasca-master: + - "@@crowbar@@" + monasca-server: + - "@@monasca-server@@" + monasca-log-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + - "@@compute-kvm@@" + - "@@storage-swift1@@" + - "@@storage-swift2@@" + - "@@monasca-server@@" + monasca-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + - "@@compute-kvm@@" + - "@@storage-swift1@@" + - "@@storage-swift2@@" + - "@@monasca-server@@" + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8b.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8b.yaml new file mode 100644 index 0000000000..ac457575c3 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-8b.yaml @@ -0,0 +1,237 @@ +--- +# 8b - 8 nodes: HA 1 x 2, IPMI, KVM x 2, CEPH x 3, Monasca +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + drbd: + enabled: true + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + +- barclamp: database + attributes: + ha: + storage: + mode: drbd + drbd: + size: 5 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + mode: drbd + drbd: + size: 5 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: ceph + attributes: + disk_mode: first + deployment: + elements: + ceph-calamari: [] + ceph-mon: + - @@ceph1@@ + - @@ceph2@@ + - @@ceph3@@ + ceph-osd: + - @@ceph1@@ + - @@ceph2@@ + - @@ceph3@@ + ceph-radosgw: + - @@ceph1@@ + ceph-mds: + - @@compute2@@ + +- barclamp: glance + attributes: + default_store: rbd + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: rbd + backend_name: rbd + rbd: + use_crowbar: true + config_file: "/etc/ceph/ceph.conf" + admin_keyring: "/etc/ceph/ceph.client.admin.keyring" + pool: volumes + user: cinder + secret_uuid: '' + flatten_volume_from_snapshot: false + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - @@controller1@@ + - @@controller2@@ + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute1@@ + - @@compute2@@ + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: ceph + shares: + - backend_driver: cephfs + backend_name: cephfs-backend + cephfs: + use_crowbar: true + cephfs_conf_path: "/etc/ceph/ceph.conf" + cephfs_auth_id: manila + cephfs_cluster_name: ceph + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - @@controller1@@ + - @@controller2@@ + +- barclamp: monasca + attributes: + deployment: + elements: + monasca-master: + - "@@crowbar@@" + monasca-server: + - "@@monasca-server@@" + monasca-log-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@compute1@@" + - "@@compute2@@" + - "@@ceph1@@" + - "@@ceph2@@" + - "@@ceph3@@" + - "@@monasca-server@@" + monasca-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@compute1@@" + - "@@compute2@@" + - "@@ceph1@@" + - "@@ceph2@@" + - "@@ceph3@@" + - "@@monasca-server@@" + +- barclamp: tempest + attributes: + manila: + run_consistency_group_tests: false + run_snapshot_tests: false + enable_protocols: cephfs + enable_ip_rules_for_protocols: "" + enable_cert_rules_for_protocols: "" + storage_protocol: CEPHFS + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml new file mode 100644 index 0000000000..1af721f236 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml @@ -0,0 +1,178 @@ +--- +# 9 - 8 nodes: HA IMPI 2 node, KVM x 3, Ceph x 3 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + @@controller1@@: + devices: + - "@@sbd_device_1@@" + @@controller2@@: + devices: + - "@@sbd_device_2@@" + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + drbd: + enabled: true + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + +- barclamp: database + attributes: + ha: + storage: + mode: drbd + drbd: + size: 5 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + mode: drbd + drbd: + size: 5 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + signing: + token_format: uuid + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: ceph + attributes: + disk_mode: first + deployment: + elements: + ceph-calamari: [] + ceph-mon: + - @@ceph1@@ + - @@ceph2@@ + - @@ceph3@@ + ceph-osd: + - @@ceph1@@ + - @@ceph2@@ + - @@ceph3@@ + ceph-radosgw: + - @@ceph1@@ + +- barclamp: glance + attributes: + filesystem_store_datadir: "/images" + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: local_file + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - "@@controller1@@" + - "@@controller2@@" + +- barclamp: neutron + attributes: + use_dvr: true + use_l2pop: true + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute1@@ + - @@compute2@@ + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: tempest + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml new file mode 100644 index 0000000000..a619311b69 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml @@ -0,0 +1,241 @@ +--- +# 1a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services +- barclamp: swift + attributes: + replicas: 2 + ssl: + enabled: true + generate_certs: true + insecure: true + cluster_hash: 181d283256 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@storage-swift1@@" + - "@@storage-swift2@@" +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services +- barclamp: nova + attributes: + itxt_instance: '' + use_shared_instance_storage: true + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + nova-compute-qemu: [] + nova-compute-xen: [] +- barclamp: horizon + attributes: + apache: + generate_certs: true + ssl: true + deployment: + elements: + horizon-server: + - cluster:services +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" +- barclamp: aodh + deployment: + elements: + aodh-server: + - "@@controller1@@" +- barclamp: barbican + attributes: + deployment: + elements: + barbican-controller: + - "@@controller1@@" +- barclamp: sahara + attributes: + deployment: + elements: + sahara-server: + - "@@controller1@@" +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml new file mode 100644 index 0000000000..6d98a8715e --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml @@ -0,0 +1,260 @@ +--- +#1b - 8 nodes: HA (IPMI 1 x 3), KVM x 2, Xen x 2 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + ssl: + enabled: true + generate_certs: true + insecure: true + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: + - "@@controller1@@" + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + nova-compute-qemu: [] + nova-compute-xen: + - "@@compute-xen1@@" + - "@@compute-xen2@@" + +- barclamp: horizon + attributes: + apache: + ssl: true + generate_certs: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm1@@" + - "@@compute-xen1@@" + - "@@compute-kvm2@@" + - "@@compute-xen2@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml new file mode 100644 index 0000000000..2e248a026a --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml @@ -0,0 +1,305 @@ +--- +# 2a - 8 nodes, HA (SBD 3x2), KVM x 1 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@controller1@@": + devices: + - "@@sbd_device_services@@" + "@@controller2@@": + devices: + - "@@sbd_device_services@@" + per_node: + nodes: + "@@controller1@@": + params: '' + "@@controller2@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + +- barclamp: pacemaker + name: data + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@data1@@": + devices: + - "@@sbd_device_data@@" + "@@data2@@": + devices: + - "@@sbd_device_data@@" + per_node: + nodes: + "@@data1@@": + params: '' + "@@data2@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@data1@@" + - "@@data2@@" + hawk-server: + - "@@data1@@" + - "@@data2@@" + +- barclamp: pacemaker + name: network + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@network1@@": + devices: + - "@@sbd_device_network@@" + "@@network2@@": + devices: + - "@@sbd_device_network@@" + per_node: + nodes: + "@@network1@@": + params: '' + "@@network2@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@network1@@" + - "@@network2@@" + hawk-server: + - "@@network1@@" + - "@@network2@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:data + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:data + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + deployment: + elements: + swift-dispersion: + - "@@controller1@@" + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@controller2@@" + - "@@compute-kvm@@" + +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + ssl: + generate_certs: true + insecure: true + api: + protocol: https + use_lbaas: false + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:network + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm@@" + nova-compute-qemu: [] + nova-compute-xen: [] + +# Because neutron and nova are deployed on different clusters, we need +# to commit neutron proposal again after nova to pick up the nova authentication +- barclamp: neutron + attributes: + use_lbaas: true + +- barclamp: horizon + attributes: + apache: + ssl: true + generate_certs: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: netapp + backend_name: netapp1 + netapp: + netapp_storage_family: ontap_cluster + netapp_server_hostname: ##netapp_server## + netapp_server_port: 80 + netapp_login: admin + netapp_password: ##netapp_password## + netapp_vserver: ##netapp_vserver## + netapp_transport_type: https + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - "@@data1@@" + - "@@data2@@" + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml new file mode 100644 index 0000000000..0b1c202304 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml @@ -0,0 +1,272 @@ +--- +# Placeholders for node devices must be replaced by some real values +# 2b - 8 nodes, HA (SBD 1 x 3), KVM x 2, ESXi x 1 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + "@@controller1@@": + devices: + - "@@sbd_device@@" + "@@controller2@@": + devices: + - "@@sbd_device@@" + "@@controller3@@": + devices: + - "@@sbd_device@@" + per_node: + nodes: + "@@controller1@@": + params: '' + "@@controller2@@": + params: '' + "@@controller3@@": + params: '' + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: 10.162.26.129:/var/qa2/ha-database + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: 10.162.26.129:/var/qa2/ha-rabbitmq + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + signing: + token_format: uuid + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + deployment: + elements: + swift-dispersion: + - "@@controller1@@" + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@computekvm1@@" + - "@@computekvm2@@" + +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +# vcenter credentials must be replaced by some real values +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + - backend_driver: vmware + backend_name: vmware-backend + vmware: + volume_folder: cinder-vmw-volume + host: vcs.qa.suse.de + user: "@@vcenter_user@@" + password: "@@vcenter_password@@" + cluster_name: [] + insecure: true + ca_file: "" + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - openvswitch + ml2_type_drivers: + - vlan + ml2_type_drivers_default_provider_network: vlan + ml2_type_drivers_default_tenant_network: vlan + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +# vcenter credentials must be replaced by some real values +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + vcenter: + clusters: + - QA + host: vcs.qa.suse.de + user: "@@vcenter_user@@" + password: "@@vcenter_password@@" + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@computekvm1@@" + - "@@computekvm2@@" + nova-compute-qemu: [] + nova-compute-xen: [] + nova-compute-vmware: + - "@@computevmw@@" + +- barclamp: horizon + attributes: + apache: + ssl: true + generate_certs: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@computekvm1@@" + - "@@computekvm2@@" + - "@@computevmw@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml new file mode 100644 index 0000000000..7c71a8ec71 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml @@ -0,0 +1,212 @@ +--- +# 2c - 7 nodes: HA x 3 SBD, KVM x 3, SES x 1 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: sbd + sbd: + nodes: + @@controller1@@: + devices: + - "@@sbd_device_services@@" + @@controller2@@: + devices: + - "@@sbd_device_services@@" + @@controller3@@: + devices: + - @@sbd_device_services@@ + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + +- barclamp: database + attributes: + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + default_store: rbd + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: rbd + backend_name: rbd + rbd: + use_crowbar: false + config_file: "/etc/ceph/ceph.conf" + admin_keyring: "/etc/ceph/ceph.client.admin.keyring" + pool: volumes + user: cinder + secret_uuid: '' + flatten_volume_from_snapshot: false + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + attributes: + apache: + ssl: true + generate_certs: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: ceph + shares: + - backend_driver: cephfs + backend_name: cephfs-backend + cephfs: + use_crowbar: false + cephfs_conf_path: "/etc/ceph/ceph.conf" + cephfs_auth_id: manila + cephfs_cluster_name: ceph + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - cluster:services + +- barclamp: tempest + attributes: + manila: + run_snapshot_tests: false + enable_protocols: cephfs + enable_ip_rules_for_protocols: "" + enable_cert_rules_for_protocols: "" + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml new file mode 100644 index 0000000000..2fa91620f2 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml @@ -0,0 +1,245 @@ +--- +# 3 - 7 nodes: HA IMPI 1 x 3, KVM x 3 +proposals: +- barclamp: nfs_client + name: glance + attributes: + exports: + glance: + nfs_server: ##shared_nfs_for_glance## + export: ##shared_nfs_export_for_glance## + mount_path: "/images" + mount_options: + - nfsvers=3 + deployment: + elements: + nfs-client: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + enabled: true + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + pacemaker-remote: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + filesystem_store_datadir: "/images" + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: default + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + kvm: + ksm_enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - remotes:services + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + attributes: + apache: + generate_certs: true + ssl: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + - @@compute3@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + +- barclamp: manila + attributes: + default_share_type: default + shares: + - backend_driver: generic + backend_name: backend1 + generic: + service_instance_user: root + service_instance_name_or_id: ##manila_instance_name_or_id## + service_net_name_or_ip: ##service_net_name_or_ip## + tenant_net_name_or_ip: ##tenant_net_name_or_ip## + service_instance_password: linux + share_volume_fstype: ext3 + path_to_private_key: "" + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - @@controller1@@ + - @@controller2@@ + - @@controller3@@ + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml new file mode 100644 index 0000000000..ab7ec7bcd6 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml @@ -0,0 +1,235 @@ +--- +# 6a - 7 nodes: HA IMPI 1 x 3, KVM x 4 +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + "@@controller1@@": + devices: + - '' + "@@controller2@@": + devices: + - '' + "@@controller3@@": + devices: + - '' + per_node: + nodes: + "@@controller1@@": + params: '' + "@@controller2@@": + params: '' + "@@controller3@@": + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: nfs_client + name: glance + attributes: + exports: + images: + nfs_server: ##nfs_server## + export: ##nfs_export## + mount_path: "/images" + mount_options: + - nfsvers=3 + deployment: + elements: + nfs-client: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: glance + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + filesystem_store_datadir: "/images" + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: local + backend_name: local_file + local: + volume_name: cinder-volumes + file_name: "/var/lib/cinder/volume.raw" + file_size: 2000 + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - "@@controller3@@" + - "@@controller1@@" + - "@@controller2@@" + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + ssl: + enabled: true + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-kvm: + - "@@kvm1@@" + - "@@kvm2@@" + - "@@kvm3@@" + - "@@kvm4@@" + +- barclamp: horizon + attributes: + apache: + generate_certs: true + ssl: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + deployment: + elements: + ceilometer-agent: + - "@@kvm2@@" + - "@@kvm1@@" + - "@@kvm3@@" + - "@@kvm4@@" + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + +- barclamp: magnum + attributes: + trustee: + domain_name: magnum + domain_admin_name: magnum_domain_admin + deployment: + elements: + magnum-server: + - "@@controller1@@" #TODO Cluster will be enabled when implementation done cluster - cluster:services + +- barclamp: tempest + attributes: + magnum: + flavor_id: m1.smaller # required by function oncontroller_magnum_service_setup in qa_crowbarsetup + master_flavor_id: m2.smaller # required by function oncontroller_magnum_service_setup in qa_crowbarsetup + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8a.yaml new file mode 100644 index 0000000000..10bbd8b392 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8a.yaml @@ -0,0 +1,259 @@ +--- +# 8a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift, Monasca +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: database + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_database## + fstype: nfs + options: nfsvers=3 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + shared: + device: ##shared_nfs_for_rabbitmq## + fstype: nfs + options: nfsvers=3 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: swift + attributes: + replicas: 2 + cluster_hash: 181d283256 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + ssl: + enabled: true + generate_certs: true + insecure: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@storage-swift1@@" + - "@@storage-swift2@@" + +- barclamp: glance + attributes: + default_store: swift + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + ssl: + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm@@" + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + attributes: + apache: + ssl: true + generate_certs: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm@@" + - "@@monasca-server@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + +- barclamp: monasca + attributes: + deployment: + elements: + monasca-master: + - "@@crowbar@@" + monasca-server: + - "@@monasca-server@@" + monasca-log-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + - "@@compute-kvm@@" + - "@@storage-swift1@@" + - "@@storage-swift2@@" + - "@@monasca-server@@" + monasca-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + - "@@compute-kvm@@" + - "@@storage-swift1@@" + - "@@storage-swift2@@" + - "@@monasca-server@@" + +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8b.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8b.yaml new file mode 100644 index 0000000000..030b8edf8b --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-8b.yaml @@ -0,0 +1,279 @@ +--- +# 8b - 8 nodes: HA 1 x 2, IPMI, KVM x 2, CEPH x 3, Monasca +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + drbd: + enabled: true + deployment: + elements: + pacemaker-cluster-member: + - @@controller1@@ + - @@controller2@@ + hawk-server: + - @@controller1@@ + - @@controller2@@ + +- barclamp: database + attributes: + ha: + storage: + mode: drbd + drbd: + size: 5 + deployment: + elements: + database-server: + - cluster:services + +- barclamp: rabbitmq + attributes: + ha: + storage: + mode: drbd + drbd: + size: 5 + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services + +- barclamp: keystone + attributes: + ssl: + generate_certs: true + insecure: true + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services + +- barclamp: ceph + attributes: + disk_mode: first + radosgw: + ssl: + enabled: true + generate_certs: true + insecure: true + deployment: + elements: + ceph-calamari: [] + ceph-mon: + - @@ceph1@@ + - @@ceph2@@ + - @@ceph3@@ + ceph-osd: + - @@ceph1@@ + - @@ceph2@@ + - @@ceph3@@ + ceph-radosgw: + - @@ceph1@@ + ceph-mds: + - @@compute2@@ + +- barclamp: glance + attributes: + default_store: rbd + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: rbd + backend_name: rbd + rbd: + use_crowbar: true + config_file: "/etc/ceph/ceph.conf" + admin_keyring: "/etc/ceph/ceph.client.admin.keyring" + pool: volumes + user: cinder + secret_uuid: '' + flatten_volume_from_snapshot: false + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - @@controller1@@ + - @@controller2@@ + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + num_vlans: 99 + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services + +- barclamp: nova + attributes: + itxt_instance: '' + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + ssl: + generate_certs: true + insecure: true + novnc: + ssl: + enabled: true + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - @@compute1@@ + - @@compute2@@ + nova-compute-qemu: [] + nova-compute-xen: [] + +- barclamp: horizon + attributes: + apache: + ssl: true + generate_certs: true + deployment: + elements: + horizon-server: + - cluster:services + +- barclamp: heat + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + heat-server: + - cluster:services + +- barclamp: ceilometer + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + ceilometer-agent: + - @@compute1@@ + - @@compute2@@ + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: [] + +- barclamp: manila + attributes: + default_share_type: ceph + shares: + - backend_driver: cephfs + backend_name: cephfs-backend + cephfs: + use_crowbar: true + cephfs_conf_path: "/etc/ceph/ceph.conf" + cephfs_auth_id: manila + cephfs_cluster_name: ceph + deployment: + elements: + manila-server: + - cluster:services + manila-share: + - @@controller1@@ + - @@controller2@@ + +- barclamp: monasca + attributes: + deployment: + elements: + monasca-master: + - "@@crowbar@@" + monasca-server: + - "@@monasca-server@@" + monasca-log-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@compute1@@" + - "@@compute2@@" + - "@@ceph1@@" + - "@@ceph2@@" + - "@@ceph3@@" + - "@@monasca-server@@" + monasca-agent: + - "@@controller1@@" + - "@@controller2@@" + - "@@compute1@@" + - "@@compute2@@" + - "@@ceph1@@" + - "@@ceph2@@" + - "@@ceph3@@" + - "@@monasca-server@@" + +- barclamp: tempest + attributes: + manila: + run_consistency_group_tests: false + run_snapshot_tests: false + enable_protocols: cephfs + enable_ip_rules_for_protocols: "" + enable_cert_rules_for_protocols: "" + storage_protocol: CEPHFS + deployment: + elements: + tempest: + - @@controller1@@ diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml new file mode 100644 index 0000000000..7ba30b9fe9 --- /dev/null +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml @@ -0,0 +1,245 @@ +--- +# 1a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift +proposals: +- barclamp: pacemaker + name: services + attributes: + stonith: + mode: ipmi_barclamp + sbd: + nodes: + @@controller1@@: + devices: + - '' + @@controller2@@: + devices: + - '' + @@controller3@@: + devices: + - '' + per_node: + nodes: + @@controller1@@: + params: '' + @@controller2@@: + params: '' + @@controller3@@: + params: '' + drbd: + deployment: + elements: + pacemaker-cluster-member: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + hawk-server: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" +- barclamp: database + attributes: + mysql: + ssl: + enabled: true + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + deployment: + elements: + database-server: + - cluster:services +- barclamp: rabbitmq + attributes: + ssl: + enabled: true + certfile: ##certfile## + keyfile: ##keyfile## + client_ca_certs: ##cafile## + client: + enable_notifications: true + deployment: + elements: + rabbitmq-server: + - cluster:services +- barclamp: keystone + attributes: + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + api: + protocol: https + deployment: + elements: + keystone-server: + - cluster:services +- barclamp: swift + attributes: + replicas: 2 + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + cluster_hash: 181d283256 + keystone_delay_auth_decision: true + allow_versions: true + middlewares: + crossdomain: + enabled: true + formpost: + enabled: true + staticweb: + enabled: true + tempurl: + enabled: true + deployment: + elements: + swift-dispersion: [] + swift-proxy: + - cluster:services + swift-ring-compute: + - "@@controller1@@" + swift-storage: + - "@@storage-swift1@@" + - "@@storage-swift2@@" +- barclamp: glance + attributes: + api: + protocol: https + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + default_store: swift + deployment: + elements: + glance-server: + - cluster:services + +- barclamp: cinder + attributes: + volumes: + - backend_driver: nfs + backend_name: nfs + nfs: + nfs_shares: ##cinder-storage-shares## + nfs_snapshot: true + api: + protocol: https + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + deployment: + elements: + cinder-controller: + - cluster:services + cinder-volume: + - cluster:services + +- barclamp: neutron + attributes: + ml2_mechanism_drivers: + - ##networkingplugin## + ml2_type_drivers: + - ##networkingmode## + num_vlans: 99 + ml2_type_drivers_default_provider_network: ##networkingmode## + ml2_type_drivers_default_tenant_network: ##networkingmode## + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + api: + protocol: https + deployment: + elements: + neutron-server: + - cluster:services + neutron-network: + - cluster:services +- barclamp: nova + attributes: + itxt_instance: '' + use_shared_instance_storage: true + use_migration: true + vnc_keymap: de + kvm: + ksm_enabled: true + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + novnc: + ssl: + enabled: true + metadata: + vendordata: + json: '{"custom-key": "custom-value"}' + deployment: + elements: + ec2-api: + - cluster:services + nova-controller: + - cluster:services + nova-compute-hyperv: [] + nova-compute-kvm: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + nova-compute-qemu: [] + nova-compute-xen: [] +- barclamp: horizon + attributes: + apache: + ssl: true + ssl_crt_file: ##certfile## + ssl_key_file: ##keyfile## + ssl_crt_chain_file: ##cafile## + deployment: + elements: + horizon-server: + - cluster:services +- barclamp: heat + attributes: + deployment: + elements: + heat-server: + - cluster:services +- barclamp: ceilometer + attributes: + deployment: + elements: + ceilometer-agent: + - "@@compute-kvm1@@" + - "@@compute-kvm2@@" + ceilometer-agent-hyperv: [] + ceilometer-central: + - cluster:services + ceilometer-server: + - cluster:services + ceilometer-swift-proxy-middleware: + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" +- barclamp: aodh + deployment: + elements: + aodh-server: + - "@@controller1@@" +- barclamp: barbican + attributes: + deployment: + elements: + barbican-controller: + - "@@controller1@@" +- barclamp: sahara + attributes: + deployment: + elements: + sahara-server: + - "@@controller1@@" +- barclamp: tempest + attributes: + deployment: + elements: + tempest: + - "@@controller1@@" From 467ec5f55036e2bc2aef077ed59fed0e3504c22e Mon Sep 17 00:00:00 2001 From: Johannes Grassler Date: Mon, 9 Sep 2019 15:15:34 +0200 Subject: [PATCH 2/3] Adjust Cloud 8 upgrade scenarios (SOC-10269) This commit makes various adjustments to the Cloud 8 upgrade QA scenarios to account for things that would otherwise fail prechecks: * Removes Aodh and Trove deployment from all Cloud 8 upgrade scenarios. * Ceilometer is removed from all scenarios that lack Monasca. * The nova-compute-kvm role is no longer assigned in any scenarios (use the regular Cloud 8 scenarios to check whether the precheck for that role being present triggers) --- .../cloud8-upgrade/cloud8-2nodes-default.yml | 21 -------------- .../cloud8-5nodes-compute-ha.yml | 27 ----------------- .../cloud8-upgrade/cloud8-5nodes-default.yml | 29 ------------------- .../qa/no-ssl/qa-scenario-1b.yaml | 4 +-- .../qa/no-ssl/qa-scenario-2a.yaml | 13 --------- .../qa/no-ssl/qa-scenario-2b.yaml | 13 --------- .../qa/no-ssl/qa-scenario-2c.yaml | 14 --------- .../qa/no-ssl/qa-scenario-3.yaml | 14 --------- .../qa/no-ssl/qa-scenario-6a.yaml | 13 --------- .../qa/no-ssl/qa-scenario-9.yaml | 13 --------- .../qa/ssl-insecure/qa-scenario-1a.yaml | 21 -------------- .../qa/ssl-insecure/qa-scenario-1b.yaml | 25 ++-------------- .../qa/ssl-insecure/qa-scenario-2a.yaml | 13 --------- .../qa/ssl-insecure/qa-scenario-2b.yaml | 15 ---------- .../qa/ssl-insecure/qa-scenario-2c.yaml | 15 ---------- .../qa/ssl-insecure/qa-scenario-3.yaml | 14 --------- .../qa/ssl-insecure/qa-scenario-6a.yaml | 13 --------- .../cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml | 21 -------------- 18 files changed, 3 insertions(+), 295 deletions(-) diff --git a/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml b/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml index 555a1abc0a..8689aadec6 100644 --- a/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml +++ b/scripts/scenarios/cloud8-upgrade/cloud8-2nodes-default.yml @@ -8,8 +8,6 @@ proposals: - @@controller@@ - barclamp: rabbitmq attributes: - trove: - enabled: true client: enable_notifications: true deployment: @@ -142,25 +140,6 @@ proposals: elements: barbican-controller: - @@controller@@ -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - @@compute-kvm@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - @@controller@@ - ceilometer-server: - - @@controller@@ - ceilometer-swift-proxy-middleware: - - @@controller@@ -- barclamp: trove - attributes: - deployment: - elements: - trove-server: - - @@controller@@ - barclamp: magnum attributes: cert: diff --git a/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml index bf20bf2fea..d168a86eca 100644 --- a/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml +++ b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-compute-ha.yml @@ -165,27 +165,6 @@ proposals: elements: barbican-controller: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - @@compute1@@ - - @@compute2@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: - - @@controller1@@ - - @@controller2@@ -- barclamp: aodh - attributes: - deployment: - elements: - aodh-server: - - cluster:services - barclamp: manila attributes: default_share_type: default @@ -207,12 +186,6 @@ proposals: manila-share: - @@controller1@@ - @@controller2@@ -- barclamp: trove - attributes: - deployment: - elements: - trove-server: - - @@controller1@@ - barclamp: magnum attributes: cert: diff --git a/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml index 2bde382755..d404615422 100644 --- a/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml +++ b/scripts/scenarios/cloud8-upgrade/cloud8-5nodes-default.yml @@ -44,8 +44,6 @@ proposals: - cluster:services - barclamp: rabbitmq attributes: - trove: - enabled: true client: enable_notifications: true deployment: @@ -158,27 +156,6 @@ proposals: elements: barbican-controller: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - @@compute-kvm1@@ - - @@compute-kvm2@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: - - @@controller1@@ - - @@controller2@@ -- barclamp: aodh - attributes: - deployment: - elements: - aodh-server: - - cluster:services - barclamp: manila attributes: default_share_type: default @@ -200,12 +177,6 @@ proposals: manila-share: - @@controller1@@ - @@controller2@@ -- barclamp: trove - attributes: - deployment: - elements: - trove-server: - - @@controller1@@ - barclamp: magnum attributes: cert: diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml index 9d472e5152..cfe7e0d16c 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-1b.yaml @@ -144,9 +144,7 @@ proposals: - "@@compute-kvm1@@" - "@@compute-kvm2@@" nova-compute-qemu: [] - nova-compute-xen: - - "@@compute-xen1@@" - - "@@compute-xen2@@" + nova-compute-xen: [] - barclamp: horizon deployment: diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml index 1a8b02cf20..7205ed9e1e 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2a.yaml @@ -222,19 +222,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - "@@compute-kvm@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml index 4b654f6e1a..a4e94a3aa8 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2b.yaml @@ -175,19 +175,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - deployment: - elements: - ceilometer-agent: - - "@@computekvm1@@" - - "@@computevmw@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml index 2e0b66593e..6a0e914ad6 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-2c.yaml @@ -138,20 +138,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - deployment: - elements: - ceilometer-agent: - - @@compute1@@ - - @@compute2@@ - - @@compute3@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: manila attributes: default_share_type: ceph diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml index 9d54e7d5da..d4c0c9c93f 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-3.yaml @@ -160,20 +160,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - @@compute1@@ - - @@compute2@@ - - @@compute3@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml index 9815a9869a..2354e2e8aa 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-6a.yaml @@ -148,19 +148,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - deployment: - elements: - ceilometer-agent: - - "@@kvm2@@" - - "@@kvm1@@" - - "@@kvm3@@" - - "@@kvm4@@" - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - - barclamp: magnum attributes: trustee: diff --git a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml index 1af721f236..13542782e4 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/no-ssl/qa-scenario-9.yaml @@ -158,19 +158,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - deployment: - elements: - ceilometer-agent: - - @@compute1@@ - - @@compute2@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: tempest deployment: elements: diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml index a619311b69..bb49810671 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1a.yaml @@ -200,27 +200,6 @@ proposals: elements: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - "@@compute-kvm1@@" - - "@@compute-kvm2@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: - - "@@controller1@@" - - "@@controller2@@" - - "@@controller3@@" -- barclamp: aodh - deployment: - elements: - aodh-server: - - "@@controller1@@" - barclamp: barbican attributes: deployment: diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml index 6d98a8715e..c506b6fb82 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-1b.yaml @@ -1,5 +1,5 @@ --- -#1b - 8 nodes: HA (IPMI 1 x 3), KVM x 2, Xen x 2 +#1b - 8 nodes: HA (IPMI 1 x 3), KVM x 2 proposals: - barclamp: pacemaker name: services @@ -189,9 +189,7 @@ proposals: - "@@compute-kvm1@@" - "@@compute-kvm2@@" nova-compute-qemu: [] - nova-compute-xen: - - "@@compute-xen1@@" - - "@@compute-xen2@@" + nova-compute-xen: [] - barclamp: horizon attributes: @@ -210,25 +208,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - "@@compute-kvm1@@" - - "@@compute-xen1@@" - - "@@compute-kvm2@@" - - "@@compute-xen2@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: - - "@@controller1@@" - - "@@controller2@@" - - "@@controller3@@" - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml index 2e248a026a..0692585c0e 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2a.yaml @@ -262,19 +262,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - "@@compute-kvm@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml index 0b1c202304..df282fc808 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2b.yaml @@ -226,21 +226,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - "@@computekvm1@@" - - "@@computekvm2@@" - - "@@computevmw@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml index 7c71a8ec71..f3990ef4b3 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-2c.yaml @@ -166,21 +166,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - @@compute1@@ - - @@compute2@@ - - @@compute3@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: [] - - barclamp: manila attributes: default_share_type: ceph diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml index 2fa91620f2..880fc8e1f7 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-3.yaml @@ -200,20 +200,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - @@compute1@@ - - @@compute2@@ - - @@compute3@@ - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - - barclamp: manila attributes: default_share_type: default diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml index ab7ec7bcd6..4677b2ed43 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl-insecure/qa-scenario-6a.yaml @@ -201,19 +201,6 @@ proposals: heat-server: - cluster:services -- barclamp: ceilometer - deployment: - elements: - ceilometer-agent: - - "@@kvm2@@" - - "@@kvm1@@" - - "@@kvm3@@" - - "@@kvm4@@" - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - - barclamp: magnum attributes: trustee: diff --git a/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml b/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml index 7ba30b9fe9..29d2c2f430 100644 --- a/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml +++ b/scripts/scenarios/cloud8-upgrade/qa/ssl/qa-scenario-1a.yaml @@ -204,27 +204,6 @@ proposals: elements: heat-server: - cluster:services -- barclamp: ceilometer - attributes: - deployment: - elements: - ceilometer-agent: - - "@@compute-kvm1@@" - - "@@compute-kvm2@@" - ceilometer-agent-hyperv: [] - ceilometer-central: - - cluster:services - ceilometer-server: - - cluster:services - ceilometer-swift-proxy-middleware: - - "@@controller1@@" - - "@@controller2@@" - - "@@controller3@@" -- barclamp: aodh - deployment: - elements: - aodh-server: - - "@@controller1@@" - barclamp: barbican attributes: deployment: From dc7a11f42c9d5b486c7f37d43cb704f2fab29162 Mon Sep 17 00:00:00 2001 From: Johannes Grassler Date: Tue, 10 Sep 2019 14:01:31 +0200 Subject: [PATCH 3/3] Add scenario_dir option to QA scenario jobs This commit adds an optional scenario_dir option to the QA scenario jobs. This option allows a user to specify a custom scenario directory, which is needed to reach the special upgrade scenarios in the cloud8-upgrade directory. --- .../cloud-mkphyscloud-qa-scenario-1a.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-1b.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-2a.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-2b.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-2c.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-3.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-6a.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-7.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-8a.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-8b.yaml | 18 +++++++++++++++++- .../cloud-mkphyscloud-qa-scenario-9.yaml | 18 +++++++++++++++++- 11 files changed, 187 insertions(+), 11 deletions(-) diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1a.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1a.yaml index 288e809108..f682853f71 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1a.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1a.yaml @@ -93,6 +93,14 @@ default: "9" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-1a.yaml @@ -202,8 +210,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1b.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1b.yaml index dc545e2681..dd7d350c1e 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1b.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-1b.yaml @@ -87,6 +87,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-1b.yaml @@ -176,8 +184,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2a.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2a.yaml index 09b517b1fe..87bd8263d6 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2a.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2a.yaml @@ -103,6 +103,14 @@ default: "9" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-2a.yaml @@ -214,8 +222,16 @@ # copy scripts/ directory onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2b.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2b.yaml index cfb02e832f..825782c022 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2b.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2b.yaml @@ -83,6 +83,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-2b.yaml @@ -173,8 +181,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2c.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2c.yaml index 424e3f739a..fd2f43b84a 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2c.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2c.yaml @@ -86,6 +86,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-2c.yaml @@ -192,8 +200,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-3.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-3.yaml index a35d2dda8e..b3b82e485c 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-3.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-3.yaml @@ -86,6 +86,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-3.yaml @@ -179,8 +187,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-6a.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-6a.yaml index 6c080b2d18..5bc7b3788f 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-6a.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-6a.yaml @@ -75,6 +75,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-6a.yaml @@ -171,8 +179,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-7.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-7.yaml index a3bb71be9e..91d7a22bf0 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-7.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-7.yaml @@ -93,6 +93,14 @@ default: "9" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-7.yaml @@ -204,8 +212,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8a.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8a.yaml index 14b6758897..789bd53ad1 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8a.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8a.yaml @@ -85,6 +85,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-8a.yaml @@ -177,8 +185,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8b.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8b.yaml index 9aa03f0c13..22cbb4567d 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8b.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-8b.yaml @@ -85,6 +85,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-8b.yaml @@ -182,8 +190,16 @@ # copy scripts/ dir onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0 diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-9.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-9.yaml index 44181b1fde..11bfc28519 100644 --- a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-9.yaml +++ b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-9.yaml @@ -82,6 +82,14 @@ default: "8" description: Mandatory, version of the cloud to be installed as integer + - string: + name: scenario_dir + default: "" + description: | + Custom scenario directory to look for scenario file in. If + unspecified this will be determined automatically based on cloud + version and SSL settings. + - string: name: scenario_file default: qa-scenario-9.yaml @@ -167,8 +175,16 @@ # copy scripts/ directory onto the admin node in /root/scripts scp -r ~/github.com/$repo_owner/automation/scripts mkcloud.config root@$admin: + # Use custom scenario dir if specified, otherwise default to the one + # based on $cloud_version and $ssl_type. + + if [ -z "$scenario_dir" ]; then + scenario_dir=scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file + fi + # copy scenario file onto the admin node in /root/scenario.yml - scp ~/github.com/$repo_owner/automation/scripts/scenarios/cloud$cloud_version/qa/$ssl_type/$scenario_file \ + + scp ~/github.com/$repo_owner/automation/${scenario_dir}/${scenario_file} \ root@$admin:scenario.yml ret=0