summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/01-deploybundle.sh9
-rw-r--r--ci/bundle_tpl/bundle.yaml15
-rw-r--r--ci/bundle_tpl/haclusters.yaml1
-rw-r--r--ci/bundle_tpl/harelations.yaml1
-rw-r--r--ci/bundle_tpl/oclphase1.yaml58
-rw-r--r--ci/bundle_tpl/relations.yaml71
-rw-r--r--ci/bundle_tpl/subordinate.yaml11
7 files changed, 125 insertions, 41 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 78f3cf50..25ee38e0 100755
--- a/ci/01-deploybundle.sh
+++ b/ci/01-deploybundle.sh
@@ -152,13 +152,8 @@ else
var=os-$4-$fea-$1
fi
-if [ "$4" != "nosdn" ]; then
- python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
-elif [ "$4" == "odl" ]; then
- python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
-elif [ "$4" == "onos" ]; then
- python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
-fi
+#lets generate the bundle for all target using genBundle.py
+python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml
echo "... Deployment Started ...."
juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 4aae4fb0..e02c6da5 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -18,6 +18,11 @@ openstack-phase1:
{% endif %}
ntp:
charm: "local:{{ ubuntu.release }}/ntp"
+{% 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"
+ auto_peers: false
+{% endif %}
{% include 'mysql.yaml' %}
{% include 'ceilometer.yaml' %}
{% include 'ceph.yaml' %}
@@ -34,19 +39,21 @@ openstack-phase1:
{% include 'neutron-api.yaml' %}
{% include 'neutron-gateway.yaml' %}
{% if os.network.controller == 'odl' %}
- {% include 'odl.yaml' %}
+{% include 'odl.yaml' %}
{% elif os.network.controller == 'onos' %}
- {% include 'onos.yaml' %}
+{% include 'onos.yaml' %}
+{% elif os.network.controller == 'ocl' %}
+{% include 'oclphase1.yaml' %}
{% endif %}
{% if os.ha.mode == 'ha' %}
- {% include 'haclusters.yaml' %}
+{% include 'haclusters.yaml' %}
{% endif %}
relations:
- - "ntp:juju-info"
- "nodes:juju-info"
{% if os.ha.mode == 'ha' %}
- {% include 'harelations.yaml' %}
+{% include 'harelations.yaml' %}
{% endif %}
openstack-phase2:
diff --git a/ci/bundle_tpl/haclusters.yaml b/ci/bundle_tpl/haclusters.yaml
index ef193654..a6639950 100644
--- a/ci/bundle_tpl/haclusters.yaml
+++ b/ci/bundle_tpl/haclusters.yaml
@@ -1,4 +1,3 @@
-
hacluster-keystone:
charm: "local:{{ ubuntu.release }}/hacluster"
options:
diff --git a/ci/bundle_tpl/harelations.yaml b/ci/bundle_tpl/harelations.yaml
index bc089d0c..e9405621 100644
--- a/ci/bundle_tpl/harelations.yaml
+++ b/ci/bundle_tpl/harelations.yaml
@@ -1,5 +1,4 @@
{% if os.ha.mode == 'ha' %}
-
- - mysql:ha
- hacluster-mysql:ha
- - cinder:ha
diff --git a/ci/bundle_tpl/oclphase1.yaml b/ci/bundle_tpl/oclphase1.yaml
new file mode 100644
index 00000000..afef96c0
--- /dev/null
+++ b/ci/bundle_tpl/oclphase1.yaml
@@ -0,0 +1,58 @@
+ zookeeper:
+ charm: local:precise/zookeeper
+ num_units: {{ unit_qty() }}
+ series: precise
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+ cassandra:
+ charm: local:{{ ubuntu.release }}/cassandra
+ num_units: {{ unit_qty() }}
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+ options:
+ authenticator: AllowAllAuthenticator
+ contrail-configuration:
+ charm: local:{{ ubuntu.release }}/contrail-configuration
+ num_units: {{ unit_qty() }}
+ options:
+{% if os.ha.mode == 'ha' %}
+ vip: {{ opnfv.vip.contrailconfig }}
+{% endif %}
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+ contrail-control:
+ charm: local:{{ ubuntu.release }}/contrail-control
+ num_units: {{ unit_qty() }}
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+ contrail-analytics:
+ charm: local:{{ ubuntu.release }}/contrail-analytics
+ num_units: {{ unit_qty() }}
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+ contrail-webui:
+ charm: local:{{ ubuntu.release }}/contrail-webui
+ num_units: {{ unit_qty() }}
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
+ haproxy:
+ charm: local:{{ ubuntu.release }}/haproxy
+ num_units: {{ unit_qty() }}
+ options:
+ peering_mode: active-active
+ to:
+{% for unit_id in to_select() %}
+ - "lxc:nodes={{ unit_id }}"
+{% endfor %}
diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index c2e12a98..fed519f8 100644
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -89,36 +89,51 @@
- - congress:amqp
- rabbitmq-server:amqp
{% if os.lxd %}
- - - nova-compute:lxd
- - lxd:lxd
+ - [ nova-compute:lxd, lxd:lxd ]
{% endif %}
{% if os.network.controller == 'nosdn' %}
- - - neutron-openvswitch:amqp
- - rabbitmq-server:amqp
- - - nova-compute:neutron-plugin
- - neutron-openvswitch:neutron-plugin
- - - neutron-openvswitch:neutron-plugin-api
- - neutron-api:neutron-plugin-api
+ - [ neutron-openvswitch:amqp, rabbitmq-server:amqp ]
+ - [ nova-compute:neutron-plugin, neutron-openvswitch:neutron-plugin ]
+ - [ neutron-openvswitch:neutron-plugin-api, neutron-api:neutron-plugin-api ]
{% elif os.network.controller == 'odl' %}
- - - "neutron-api:neutron-plugin-api-subordinate"
- - "neutron-api-odl:neutron-plugin-api-subordinate"
- - - "nova-compute:neutron-plugin"
- - "openvswitch-odl:neutron-plugin"
- - - "neutron-gateway"
- - "openvswitch-odl"
- - - "openvswitch-odl:ovsdb-manager"
- - "odl-controller:ovsdb-manager"
- - - "neutron-api-odl:odl-controller"
- - "odl-controller:controller-api"
+ - [ neutron-api:neutron-plugin-api-subordinate, neutron-api-odl:neutron-plugin-api-subordinate ]
+ - [ nova-compute:neutron-plugin, openvswitch-odl:neutron-plugin ]
+ - [ neutron-gateway, openvswitch-odl ]
+ - [ openvswitch-odl:ovsdb-manager, odl-controller:ovsdb-manager ]
+ - [ neutron-api-odl:odl-controller, odl-controller:controller-api ]
{% elif os.network.controller == 'onos' %}
- - - "neutron-api:neutron-plugin-api-subordinate"
- - "neutron-api-onos:neutron-plugin-api-subordinate"
- - - "nova-compute:neutron-plugin"
- - "openvswitch-onos:neutron-plugin"
- - - "neutron-gateway"
- - "openvswitch-onos"
- - - "openvswitch-onos:ovsdb-manager"
- - "onos-controller:ovsdb-manager"
- - - "neutron-api-onos:onos-controller"
- - "onos-controller:controller-api"
+ - [ neutron-api:neutron-plugin-api-subordinate, neutron-api-onos:neutron-plugin-api-subordinate ]
+ - [ nova-compute:neutron-plugin, openvswitch-onos:neutron-plugin ]
+ - [ neutron-gateway, openvswitch-onos ]
+ - [ openvswitch-onos:ovsdb-manager, onos-controller:ovsdb-manager ]
+ - [ neutron-api-onos:onos-controller, onos-controller:controller-api ]
+{% elif os.network.controller == 'ocl' %}
+ - [ contrail-configuration:cassandra, cassandra:database ]
+ - [ contrail-configuration, zookeeper ]
+ - [ contrail-configuration, rabbitmq-server ]
+ - [ contrail-configuration, keystone ]
+ - [ neutron-api-contrail, contrail-configuration ]
+ - [ neutron-api-contrail, keystone ]
+ - [ contrail-control:contrail-api, contrail-configuration:contrail-api ]
+ - [ contrail-control:contrail-discovery, contrail-configuration:contrail-discovery ]
+ - [ contrail-control:contrail-ifmap, contrail-configuration:contrail-ifmap ]
+ - [ contrail-control, keystone ]
+ - [ contrail-analytics:cassandra, cassandra:database ]
+ - [ contrail-analytics:contrail-analytics-api, contrail-configuration:contrail-analytics-api ]
+ - [ contrail-configuration:contrail-discovery, contrail-analytics:contrail-discovery ]
+ - [ contrail-webui, keystone ]
+ - [ contrail-webui:contrail_api, contrail-configuration:contrail-api ]
+ - [ contrail-webui:contrail_discovery, contrail-configuration:contrail-discovery ]
+ - [ contrail-webui:cassandra, cassandra:database ]
+ - [ nova-compute, neutron-contrail ]
+ - [ neutron-contrail:contrail-discovery, contrail-configuration:contrail-discovery ]
+ - [ neutron-contrail:contrail-api, contrail-configuration:contrail-api ]
+ - [ neutron-contrail, keystone ]
+ - [ contrail-configuration, ntp ]
+ - [ contrail-control, ntp ]
+ - [ contrail-analytics, ntp ]
+ - [ contrail-configuration, haproxy ]
+ - [ contrail-analytics, haproxy ]
+ - [ contrail-webui, haproxy ]
+ - [ haproxy, keepalived ]
{% endif %}
diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml
index 334582d9..ce31ec81 100644
--- a/ci/bundle_tpl/subordinate.yaml
+++ b/ci/bundle_tpl/subordinate.yaml
@@ -22,6 +22,17 @@
security-groups: True
openvswitch-onos:
charm: local:{{ ubuntu.release }}/openvswitch-onos
+{% elif os.network.controller == 'ocl' %}
+ neutron-api-contrail:
+ charm: local:{{ ubuntu.release }}/neutron-api-contrail
+ neutron-contrail:
+ charm: local:{{ ubuntu.release }}/neutron-contrail
+ keepalived:
+ charm: local:{{ ubuntu.release }}/keepalived
+ options:
+{% if os.ha.mode == 'ha' %}
+ virtual-ip: {{ opnfv.vip.keepalived }}
+{% endif %}
{% endif %}
{% if os.lxd %}
lxd: