summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/aodh.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/ceph.yaml14
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/cinder.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/congress.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/glance.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/heat.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/keystone.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml2
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml4
-rw-r--r--ci/default_deployment_config.yaml1
14 files changed, 40 insertions, 1 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
index fc5f148f..92617ea1 100644
--- a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
@@ -1,6 +1,7 @@
aodh:
charm: "./{{ ubuntu.release }}/aodh"
num_units: 1
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
to:
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 6c3eec4b..554450f6 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -6,6 +6,7 @@
ceilometer:
charm: "./{{ ubuntu.release }}/ceilometer"
num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -18,6 +19,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 63a95d9b..16a3206d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -36,7 +36,11 @@
ceph-osd:
charm: "./{{ ubuntu.release }}/ceph-osd"
{% if os.hyperconverged %}
+{% if opnfv.units >= 3 %}
+ num_units: {{ unit_ceph_qty() }}
+{% else %}
num_units: {{ opnfv.units }}
+{% endif %}
{% else %}
num_units: 3
{% endif %}
@@ -53,10 +57,16 @@
{% endif %}
to:
{% if os.hyperconverged %}
-{% for unit_id in range(0, opnfv.units) %}
+{% if opnfv.units >= 3 %}
+{% for unit_id in range(0, 3) %}
- "nodes/{{ unit_id }}"
{% endfor %}
{% else %}
+ {% for unit_id in range(0, opnfv.units) %}
+ - "nodes/{{ unit_id }}"
+ {% endfor %}
+{% endif %}
+{% else %}
{% if os.ha.mode == 'ha' %}
{% for unit_id in range(0, 3) %}
- "nodes/{{ unit_id }}"
@@ -70,6 +80,7 @@
ceph-radosgw:
charm: "./{{ ubuntu.release }}/ceph-radosgw"
num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -82,6 +93,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
region: {{ os.region }}
use-embedded-webserver: true
diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index 18313cbb..82c15c38 100644
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -5,6 +5,7 @@
{% else %}
num_units: {{ unit_qty() }}
{% endif %}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -17,6 +18,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/congress.yaml b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
index 8e75826a..b57bf328 100644
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
@@ -1,6 +1,7 @@
congress:
charm: "./{{ ubuntu.release }}/congress"
num_units: 1
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
region: {{ os.region }}
{% if ubuntu.release == 'trusty' %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index cf535486..e8eee7fd 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -1,6 +1,7 @@
glance:
charm: "./{{ ubuntu.release }}/glance"
num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
index f6f29ef1..4af546d3 100644
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -1,6 +1,7 @@
heat:
charm: "./{{ ubuntu.release }}/heat"
num_units: 1
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index 5a8e16c1..c25f309b 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -1,6 +1,7 @@
keystone:
charm: "./{{ ubuntu.release }}/keystone"
num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index c7789d82..863715d3 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -1,6 +1,7 @@
neutron-api:
charm: "./{{ ubuntu.release }}/neutron-api"
num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index 16b4b1ca..cb459cc1 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -2,9 +2,11 @@
charm: "./{{ ubuntu.release }}/neutron-gateway"
num_units: 1
{% if opnfv.spaces_dict.data is defined %}
+{% if os.service.bindings %}
bindings:
data: admin
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
{% if os.api.worker_multiplier %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index 21155c49..7eb02534 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -2,9 +2,11 @@
charm: ./{{ ubuntu.release }}/neutron-openvswitch
options:
{% if opnfv.spaces_dict.data is defined %}
+{% if os.service.bindings %}
bindings:
data: admin
{% endif %}
+{% endif %}
{% if os.network.dpdk %}
enable-dpdk: true
#dpdk-driver: uio_pci_generic
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
index ef36ea78..e20e99a7 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -1,6 +1,7 @@
nova-cloud-controller:
charm: "./{{ ubuntu.release }}/nova-cloud-controller"
num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
bindings:
internal: internal
{% if opnfv.spaces_dict.data is defined %}
@@ -13,6 +14,7 @@
{% else %}
public: internal
{% endif %}
+{% endif %}
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
index daf9a13a..a9515202 100644
--- a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
@@ -1,6 +1,10 @@
rabbitmq-server:
charm: "./{{ ubuntu.release }}/rabbitmq-server"
num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
+ bindings:
+ amqp: internal
+{% endif %}
options:
{% if opnfv.storage_dict.ceph is defined %}
ceph-osd-replication-count: {{ unit_ceph_qty() }}
diff --git a/ci/default_deployment_config.yaml b/ci/default_deployment_config.yaml
index 887b0966..61bd9f04 100644
--- a/ci/default_deployment_config.yaml
+++ b/ci/default_deployment_config.yaml
@@ -30,5 +30,6 @@ os:
service:
congress: True
promise: True
+ bindings: False
kubernetes:
loadbalancer: False