Change-Id: Ic394674dd026f834dcee0db566dff7c654a2dba3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
'admin') JUJU_SPACE="internal-api"; DHCP='enabled' ;;
'data') JUJU_SPACE="tenant-data"; DHCP='' ;;
'public') JUJU_SPACE="public-api"; DHCP='' ;;
'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
'floating') JUJU_SPACE="tenant-public"; DHCP='' ;;
*) JUJU_SPACE='default'; DHCP='OFF'; echo_info " >>> Unknown SPACE" ;;
esac
num_units: {{ unit_ceph_qty() }}
{% if os.service.bindings %}
bindings:
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 %}
{% if opnfv.spaces_dict.storage is defined %}
{% if opnfv.spaces_dict.storage is defined %}
+ public: storage-cluster
{% endif %}
{% endif %}
options:
{% endif %}
{% endif %}
options:
{% endif %}
{% if os.service.bindings %}
bindings:
{% endif %}
{% if os.service.bindings %}
bindings:
-{% if opnfv.spaces_dict.public is defined %}
- public: internal-api
-{% else %}
- public: internal-api
-{% endif %}
{% if opnfv.spaces_dict.storage is defined %}
{% if opnfv.spaces_dict.storage is defined %}
+ public: storage-cluster
+ cluster: storage-cluster
cluster: internal-api
{% endif %}
{% endif %}
cluster: internal-api
{% endif %}
{% endif %}
num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
{% if os.service.bindings %}
bindings:
num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
{% if os.service.bindings %}
bindings:
internal: internal-api
admin: internal-api
{% if opnfv.spaces_dict.public is defined %}
internal: internal-api
admin: internal-api
{% if opnfv.spaces_dict.public is defined %}