Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
modified to have cph monitor in rados gateway.
[joid.git]
/
ci
/
config_tpl
/
juju2
/
bundle_tpl
/
ceph.yaml
diff --git
a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index
6b20d98
..
eda8496
100644
(file)
--- 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:
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 %}
{% if opnfv.spaces_dict.storage is defined %}
- cluster: internal-api
+ public: storage-cluster
{% else %}
{% else %}
-
cluster
: internal-api
+
public
: internal-api
{% endif %}
{% endif %}
options:
{% endif %}
{% endif %}
options:
@@
-56,14
+52,12
@@
{% 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 %}
+ "": internal-api
{% if opnfv.spaces_dict.storage is defined %}
{% if opnfv.spaces_dict.storage is defined %}
- cluster: internal-api
+ public: storage-cluster
+ cluster: storage-cluster
{% else %}
{% else %}
+ public: internal-api
cluster: internal-api
{% endif %}
{% endif %}
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:
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 %}
internal: internal-api
admin: internal-api
{% if opnfv.spaces_dict.public is defined %}
@@
-116,6
+111,9
@@
{% else %}
public: internal-api
{% endif %}
{% else %}
public: internal-api
{% endif %}
+{% if opnfv.spaces_dict.storage is defined %}
+ mon: storage-cluster
+{% endif %}
{% endif %}
options:
region: {{ os.region }}
{% endif %}
options:
region: {{ os.region }}