Merge pull request #3711 from gosipyan/update_scenario-2a

Update qa-scenario-2a (SOC-10460)
SUSE-Cloud · Nov 29, 2019 · 169715b · 169715b
2 parents 9fafe67 + 9f1974b
commit 169715b
Show file tree

Hide file tree

Showing 4 changed files with 354 additions and 97 deletions.
diff --git a/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2a.yaml b/jenkins/ci.suse.de/cloud-mkphyscloud-qa-scenario-2a.yaml
@@ -152,7 +152,10 @@
       - string:
           name: commands
           default: addupdaterepo prepareinstallcrowbar runupdate bootstrapcrowbar installcrowbar allocate waitcloud setup_aliases
-          description: All the steps that needs to be completed to have cloud installed
+          description: All the steps that needs to be completed to have cloud installed:When deploying with SSL add "install_ca_certificates" after "setup_aliases" command
+          choices:
+            - addupdaterepo prepareinstallcrowbar runupdate bootstrapcrowbar installcrowbar allocate waitcloud setup_aliases
+            - addupdaterepo prepareinstallcrowbar runupdate bootstrapcrowbar installcrowbar allocate waitcloud setup_aliases install_ca_certificates
 
       - string:
           name: want_test_updates
@@ -220,7 +223,19 @@
 
           ret=0
 
+          # copy CA files
+          if [[ $ssl_type = "ssl" ]]; then
+             ssh root@crowbar$hw_number "mkdir ssl-certs"
+             scp -r /home/jenkins/ssl-certs/qa$hw_number root@crowbar$hw_number:/root/ssl-certs/
+          fi
+
           ssh root@$admin "
+          # update certificate file paths
+          if [[ $ssl_type = "ssl" ]]; then
+             sed -i -e "s,##certfile##,/etc/cloud/ssl/qa$hw_number/qa$hw_number.cloud.suse.de.crt," scenario.yml
+             sed -i -e "s,##keyfile##,/etc/cloud/ssl/qa$hw_number/qa$hw_number.cloud.suse.de.pem," scenario.yml
+             sed -i -e "s,##cafile##,/etc/cloud/ssl/qa$hw_number/SUSE_CA_suse.de.chain.crt," scenario.yml
+          fi
           export cloud=$cloud ;
           export hw_number=$hw_number ;
           export sbd_ip=$sbd_ip ;

diff --git a/scripts/scenarios/cloud8/qa/no-ssl/qa-scenario-2a.yaml b/scripts/scenarios/cloud8/qa/no-ssl/qa-scenario-2a.yaml
@@ -1,5 +1,5 @@
 ---
-# 2a - 8 nodes, HA (SBD 3x2), KVM x 1
+# 2a - 7 nodes, HA (SBD 3x2), KVM x 1
 proposals:
 - barclamp: pacemaker
   name: services
@@ -14,20 +14,27 @@ proposals:
           "@@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: pacemaker
   name: data
@@ -42,57 +49,30 @@ proposals:
           "@@data2@@":
             devices:
             - "@@sbd_device_data@@"
+          "@@data3@@":
+            devices:
+            - "@@sbd_device_data@@"
       per_node:
         nodes:
           "@@data1@@":
             params: ''
           "@@data2@@":
             params: ''
+          "@@data3@@":
+            params: ''
   deployment:
     elements:
       pacemaker-cluster-member:
       - "@@data1@@"
       - "@@data2@@"
+      - "@@data3@@"
       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@@"
+      - "@@data3@@"
 
 - barclamp: database
   attributes:
-    sql_engine: postgresql
-    ha:
-      storage:
-        shared:
-          device: ##shared_nfs_for_database##
-          fstype: nfs
   deployment:
     elements:
       database-server:
@@ -151,11 +131,21 @@ proposals:
 - barclamp: cinder
   attributes:
     volumes:
-    - backend_driver: nfs
-      backend_name: nfs
-      nfs:
-        nfs_shares: ##cinder-storage-shares##
-        nfs_snapshot: true
+    - backend_driver: netapp
+      backend_name: netapp
+      netapp:
+        nfs_shares: ''
+        netapp_vfiler: ''
+        netapp_volume_list: ''
+        storage_family: ontap_cluster
+        storage_protocol: iscsi
+        vserver: 'cloud-openstack-svm '
+        netapp_server_hostname: ##netapp_server##
+        netapp_server_port: 80
+        netapp_login: admin
+        netapp_password: ##netapp_password##
+        netapp_transport_type: http
+        max_over_subscription_ratio: 20
   deployment:
     elements:
       cinder-controller:
@@ -178,7 +168,7 @@ proposals:
       neutron-server:
       - cluster:services
       neutron-network:
-      - cluster:network
+      - cluster:services
 
 - barclamp: nova
   attributes:
@@ -222,19 +212,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/qa/ssl-insecure/qa-scenario-2a.yaml b/scripts/scenarios/cloud8/qa/ssl-insecure/qa-scenario-2a.yaml
@@ -1,5 +1,5 @@
 ---
-# 2a - 8 nodes, HA (SBD 3x2), KVM x 1
+# 2a - 7 nodes, HA (SBD 3x2), KVM x 1
 proposals:
 - barclamp: pacemaker
   name: services
@@ -14,20 +14,27 @@ proposals:
           "@@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: pacemaker
   name: data
@@ -42,70 +49,37 @@ proposals:
           "@@data2@@":
             devices:
             - "@@sbd_device_data@@"
+          "@@data3@@":
+            devices:
+            - "@@sbd_device_data@@"
       per_node:
         nodes:
           "@@data1@@":
             params: ''
           "@@data2@@":
             params: ''
+          "@@data3@@":
+            params: ''
   deployment:
     elements:
       pacemaker-cluster-member:
       - "@@data1@@"
       - "@@data2@@"
+      - "@@data3@@"
       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@@"
+      - "@@data3@@"
 
 - 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:
@@ -208,7 +182,7 @@ proposals:
       neutron-server:
       - cluster:services
       neutron-network:
-      - cluster:network
+      - cluster:services
 
 - barclamp: nova
   attributes: