diff options
| -rwxr-xr-x | ci/03-maasdeploy.sh | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 21 |
2 files changed, 10 insertions, 15 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 60ed0855..f79ea5bf 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -319,8 +319,8 @@ setupspacenetwork(){ 'admin') JUJU_SPACE="internal-api"; DHCP='enabled' ;; 'data') JUJU_SPACE="tenant-data"; DHCP='' ;; 'public') JUJU_SPACE="public-api"; DHCP='' ;; - 'storage') JUJU_SPACE="tenant-stor"; DHCP='' ;; - 'storagecluster') JUJU_SPACE="storclus"; DHCP='' ;; + 'storage') JUJU_SPACE="storage-cluster"; DHCP='' ;; + 'storageaccess') JUJU_SPACE="storage-data"; DHCP='' ;; 'floating') JUJU_SPACE="tenant-public"; DHCP='' ;; *) JUJU_SPACE='default'; DHCP='OFF'; echo_info " >>> Unknown SPACE" ;; esac diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 6b20d986..71a0264d 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -4,15 +4,11 @@ num_units: {{ unit_ceph_qty() }} {% if os.service.bindings %} bindings: -{% if opnfv.spaces_dict.public is defined %} - public: internal-api -{% else %} - public: internal-api -{% endif %} + "": internal-api {% if opnfv.spaces_dict.storage is defined %} - cluster: internal-api + public: storage-cluster {% else %} - cluster: internal-api + public: internal-api {% endif %} {% endif %} options: @@ -56,14 +52,12 @@ {% endif %} {% if os.service.bindings %} bindings: -{% if opnfv.spaces_dict.public is defined %} - public: internal-api -{% else %} - public: internal-api -{% endif %} + "": internal-api {% if opnfv.spaces_dict.storage is defined %} - cluster: internal-api + public: storage-cluster + cluster: storage-cluster {% else %} + public: internal-api cluster: internal-api {% endif %} {% endif %} @@ -109,6 +103,7 @@ num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }} {% if os.service.bindings %} bindings: + "": internal-api internal: internal-api admin: internal-api {% if opnfv.spaces_dict.public is defined %} |