Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
adding bionic support.
[joid.git]
/
ci
/
config_tpl
/
juju2
/
bundle_tpl
/
bundle.yaml
diff --git
a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index
910d607
..
1ad45fb
100644
(file)
--- a/
ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/
ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@
-1,5
+1,7
@@
# vim: set ts=2 et:
series: {{ ubuntu.release }}
# vim: set ts=2 et:
series: {{ ubuntu.release }}
+ variables:
+{% include 'spaces.yaml' %}
services:
{% if os.hyperconverged %}
nodes:
services:
{% if os.hyperconverged %}
nodes:
@@
-8,6
+10,7
@@
{% else %}
nodes:
charm: "cs:{{ ubuntu.release }}/ubuntu"
{% else %}
nodes:
charm: "cs:{{ ubuntu.release }}/ubuntu"
+ series: {{ ubuntu.release }}
{% if os.ha.mode == 'ha' %}
num_units: 3
{% else %}
{% if os.ha.mode == 'ha' %}
num_units: 3
{% else %}
@@
-16,6
+19,7
@@
nodes-compute:
charm: "cs:{{ ubuntu.release }}/ubuntu"
nodes-compute:
charm: "cs:{{ ubuntu.release }}/ubuntu"
+ series: {{ ubuntu.release }}
{% if os.ha.mode == 'ha' %}
num_units: {{ opnfv.units - 3 }}
{% else %}
{% if os.ha.mode == 'ha' %}
num_units: {{ opnfv.units - 3 }}
{% else %}
@@
-24,6
+28,7
@@
{% endif %}
ntp:
charm: "./{{ ubuntu.release }}/ntp"
{% endif %}
ntp:
charm: "./{{ ubuntu.release }}/ntp"
+ series: {{ ubuntu.release }}
{% if os.network.controller == 'ocl' %}
options:
source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
{% if os.network.controller == 'ocl' %}
options:
source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
@@
-54,9
+59,10
@@
{% include 'openstack-dashboard.yaml' %}
{% include 'rabbitmq.yaml' %}
{% include 'neutron-api.yaml' %}
{% include 'openstack-dashboard.yaml' %}
{% include 'rabbitmq.yaml' %}
{% include 'neutron-api.yaml' %}
+{% include 'heat.yaml' %}
+{% include 'designate.yaml' %}
{% if os.network.controller != 'ocl' %}
{% include 'neutron-gateway.yaml' %}
{% if os.network.controller != 'ocl' %}
{% include 'neutron-gateway.yaml' %}
-{% include 'heat.yaml' %}
{% include 'ceilometer.yaml' %}
{% endif %}
{% include 'aodh.yaml' %}
{% include 'ceilometer.yaml' %}
{% endif %}
{% include 'aodh.yaml' %}