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)

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:

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:

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:

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:

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

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

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

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

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:

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:

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:

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

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

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

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