Rework func testing bundle

- remove ceph from bundle
- fix overlay composition

tests/bundles/focal-ussuri.yaml

@@ -18,6 +18,25 @@ variables:
   ovn-channel: &ovn-channel latest/stable
   openstack-channel: &openstack-channel ussuri/edge
   mysql-channel: &mysql-channel 8.0/stable
+  repo-infinidat-apt-key: &repo-infinidat-apt-key >
+    -----BEGIN PGP PUBLIC KEY BLOCK-----
+    Version: GnuPG v1.4.11 (GNU/Linux)
+
+    mQENBFESDRIBCADMR7MQMbH4GdCQqfrOMt35MhBwwH4wv9kb1WRSTxa0CmuzYaBB
+    1nJ0nLaMAwHsEr9CytPWDpMngm/3nt+4F2hJcsOEkQkqeJ31gScJewM+AOUV3DEl
+    qOeXXYLcP+jUY6pPjlZpOw0p7moUQPXHn+7amVrk7cXGQ8O3B+5a5wjN86LT2hlX
+    DlBlV5bX/DYluiPUbvQLOknmwO53KpaeDeZc4a8iIOCYWu2ntuAMddBkTps0El5n
+    JJZMTf6os2ZzngWMZRMDiVJgqVRi2b+8SgFQlQy0cAmne/mpgPrRq0ZMX3DokGG5
+    hnIg1mF82laTxd+9qtiOxupzJqf8mncQHdaTABEBAAG0IWFwcF9yZXBvIChDb21t
+    ZW50KSA8bm9AZW1haWwuY29tPokBOAQTAQIAIgUCURINEgIbLwYLCQgHAwIGFQgC
+    CQoLBBYCAwECHgECF4AACgkQem2D/j05RYSrcggAsCc4KppV/SZX5XI/CWFXIAXw
+    +HaNsh2EwYKf9DhtoGbTOuwePvrPGcgFYM3Tu+m+rziPnnFl0bs0xwQyNEVQ9yDw
+    t465pSgmXwEHbBkoISV1e4WYtZAsnTNne9ieJ49Ob/WY4w3AkdPRK/41UP5Ct6lR
+    HHRXrSWJYHVq5Rh6BakRuMJyJLz/KvcJAaPkA4U6VrPD7PFtSecMTaONPjGCcomq
+    b7q84G5ZfeJWb742PWBTS8fJdC+Jd4y5fFdJS9fQwIo52Ff9In2QBpJt5Wdc02SI
+    fvQnuh37D2P8OcIfMxMfoFXpAMWjrMYc5veyQY1GXD/EOkfjjLne6qWPLfNojA==
+    =w5Os
+    -----END PGP PUBLIC KEY BLOCK-----
 machines:
   '0':
     constraints: tags=os-nodes
@@ -61,24 +80,8 @@ relations:
   - keystone:identity-service
 - - cinder:cinder-volume-service
   - nova-cloud-controller:cinder-volume-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - ceph-mon:client
-  - nova-compute:ceph
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - ceph-mon:client
-  - cinder-ceph:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-osd:mon
-  - ceph-mon:osd
 - - ntp:juju-info
   - nova-compute:juju-info
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
 - - placement:identity-service
   - keystone:identity-service
 - - placement:placement
@@ -143,8 +146,6 @@ relations:
   - openstack-dashboard:certificates
 - - vault:certificates
   - placement:certificates
-- - vault:certificates
-  - ceph-radosgw:certificates
 - - vault:certificates
   - mysql-innodb-cluster:certificates
 - - manila:shared-db
@@ -161,37 +162,6 @@ relations:
   - vault:certificates
 
 applications:
-  ceph-mon:
-    charm: ceph-mon
-    channel: octopus/edge
-    num_units: 3
-    options:
-      expected-osd-count: *expected-osd-count
-      monitor-count: *expected-mon-count
-      source: *openstack-origin
-    to:
-    - 'lxd:0'
-    - 'lxd:1'
-    - 'lxd:2'
-  ceph-osd:
-    charm: ceph-osd
-    channel: octopus/edge
-    num_units: 3
-    options:
-      osd-devices: *osd-devices
-      source: *openstack-origin
-    to:
-    - '0'
-    - '1'
-    - '2'
-  ceph-radosgw:
-    charm: ceph-radosgw
-    channel: octopus/edge
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-    - 'lxd:3'
   cinder-mysql-router:
     charm: mysql-router
     channel: latest/edge
@@ -206,10 +176,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
     - '3' # cinder can't be deployed to LXD, if iscsi is used
-  cinder-ceph:
-    charm: cinder-ceph
-    channel: *openstack-channel
-    num_units: 0
   glance-mysql-router:
     charm: mysql-router
     channel: latest/edge
@@ -372,25 +338,7 @@ applications:
   manila-infinidat:
     charm: ../../manila-infinidat.charm
     options:
-      install_keys: |
-        -----BEGIN PGP PUBLIC KEY BLOCK-----
-        Version: GnuPG v1.4.11 (GNU/Linux)
-  
-        mQENBFESDRIBCADMR7MQMbH4GdCQqfrOMt35MhBwwH4wv9kb1WRSTxa0CmuzYaBB
-        1nJ0nLaMAwHsEr9CytPWDpMngm/3nt+4F2hJcsOEkQkqeJ31gScJewM+AOUV3DEl
-        qOeXXYLcP+jUY6pPjlZpOw0p7moUQPXHn+7amVrk7cXGQ8O3B+5a5wjN86LT2hlX
-        DlBlV5bX/DYluiPUbvQLOknmwO53KpaeDeZc4a8iIOCYWu2ntuAMddBkTps0El5n
-        JJZMTf6os2ZzngWMZRMDiVJgqVRi2b+8SgFQlQy0cAmne/mpgPrRq0ZMX3DokGG5
-        hnIg1mF82laTxd+9qtiOxupzJqf8mncQHdaTABEBAAG0IWFwcF9yZXBvIChDb21t
-        ZW50KSA8bm9AZW1haWwuY29tPokBOAQTAQIAIgUCURINEgIbLwYLCQgHAwIGFQgC
-        CQoLBBYCAwECHgECF4AACgkQem2D/j05RYSrcggAsCc4KppV/SZX5XI/CWFXIAXw
-        +HaNsh2EwYKf9DhtoGbTOuwePvrPGcgFYM3Tu+m+rziPnnFl0bs0xwQyNEVQ9yDw
-        t465pSgmXwEHbBkoISV1e4WYtZAsnTNne9ieJ49Ob/WY4w3AkdPRK/41UP5Ct6lR
-        HHRXrSWJYHVq5Rh6BakRuMJyJLz/KvcJAaPkA4U6VrPD7PFtSecMTaONPjGCcomq
-        b7q84G5ZfeJWb742PWBTS8fJdC+Jd4y5fFdJS9fQwIo52Ff9In2QBpJt5Wdc02SI
-        fvQnuh37D2P8OcIfMxMfoFXpAMWjrMYc5veyQY1GXD/EOkfjjLne6qWPLfNojA==
-        =w5Os
-        -----END PGP PUBLIC KEY BLOCK-----
+      install_keys: *repo-infinidat-apt-key
       pool-name: manila
       # network space of type NAS on the Infinibox side
       nas-network-space-name: nas

tests/bundles/overlays/infinidat-auth-overlay-2.yaml.j2

@@ -1,10 +0,0 @@
-applications:
-  manila-infinidat:
-    charm: ../../manila-infinidat.charm
-    options:
-      infinibox-ip: {{ OS_INFINIDAT_IP00 }}
-      infinibox-login: {{ OS_INFINIDAT_LOGIN00 }}
-      infinibox-password: {{ OS_INFINIDAT_PASSWORD00 }}
-      pool-name: manila
-      # network space of type NAS on the Infinibox side
-      nas-network-space-name: nas

tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -0,0 +1,9 @@
+applications:
+  manila-infinidat:
+    options:
+      infinibox-ip: {{ OS_INFINIBOX_IP }}
+      infinibox-login: {{ OS_INFINIBOX_LOGIN }}
+      infinibox-password: {{ OS_INFINIBOX_PASSWORD }}
+      # network space of type NAS on the Infinibox side
+      nas-network-space-name: {{ OS_INFINIBOX_NAS_NETSPACE | default('nas') }}
+      pool-name: {{ OS_INFINIBOX_POOL_NAME | default('manila') }}