Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
move to master branch of charm for few bug fixes.
[joid.git]
/
ci
/
config_tpl
/
bundle_tpl
/
oclphase1.yaml
diff --git
a/ci/config_tpl/bundle_tpl/oclphase1.yaml
b/ci/config_tpl/bundle_tpl/oclphase1.yaml
index
1acdd1c
..
84d52bc
100644
(file)
--- a/
ci/config_tpl/bundle_tpl/oclphase1.yaml
+++ b/
ci/config_tpl/bundle_tpl/oclphase1.yaml
@@
-1,7
+1,7
@@
zookeeper:
zookeeper:
- charm: local:{{ ubuntu.release }/zookeeper
+ charm: local:{{ ubuntu.release }
}
/zookeeper
num_units: {{ unit_qty() }}
num_units: {{ unit_qty() }}
- series: {{ ubuntu.release }
+ series: {{ ubuntu.release }
}
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@
-19,10
+19,13
@@
charm: local:{{ ubuntu.release }}/contrail-configuration
num_units: {{ unit_qty() }}
options:
charm: local:{{ ubuntu.release }}/contrail-configuration
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ install-sources: |
+ - ppa:opencontrail/ppa
+ - ppa:opencontrail/trunk-20160812
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.contrailconfig }}
{% endif %}
{% if os.ha.mode == 'ha' %}
vip: {{ opnfv.vip.contrailconfig }}
{% endif %}
- install-sources: ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@
-30,7
+33,11
@@
contrail-control:
charm: local:{{ ubuntu.release }}/contrail-control
num_units: {{ unit_qty() }}
contrail-control:
charm: local:{{ ubuntu.release }}/contrail-control
num_units: {{ unit_qty() }}
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ install-sources: |
+ - ppa:opencontrail/ppa
+ - ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@
-38,7
+45,11
@@
contrail-analytics:
charm: local:{{ ubuntu.release }}/contrail-analytics
num_units: {{ unit_qty() }}
contrail-analytics:
charm: local:{{ ubuntu.release }}/contrail-analytics
num_units: {{ unit_qty() }}
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+ install-sources: |
+ - ppa:opencontrail/ppa
+ - ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@
-46,7
+57,10
@@
contrail-webui:
charm: local:{{ ubuntu.release }}/contrail-webui
num_units: {{ unit_qty() }}
contrail-webui:
charm: local:{{ ubuntu.release }}/contrail-webui
num_units: {{ unit_qty() }}
- install-sources: ppa:opencontrail/trunk-20160812
+ options:
+ install-sources: |
+ - ppa:opencontrail/ppa
+ - ppa:opencontrail/trunk-20160812
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
to:
{% for unit_id in to_select() %}
- "lxc:nodes={{ unit_id }}"
@@
-61,7
+75,7
@@
- "lxc:nodes={{ unit_id }}"
{% endfor %}
kafka:
- "lxc:nodes={{ unit_id }}"
{% endfor %}
kafka:
- charm: local:{{ ubuntu.release }}/kafka
:
+ charm: local:{{ ubuntu.release }}/kafka
num_units: {{ unit_qty() }}
to:
{% for unit_id in to_select() %}
num_units: {{ unit_qty() }}
to:
{% for unit_id in to_select() %}