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: