modfied to suite the latest code changes.

Change-Id: I36f4f20a9222fe7c4cc75dd3d546a28130c3fbb2
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

17 files changed, 118 insertions, 90 deletions

diff --git a/ci/bundle_tpl/bundle.yaml b/ci/bundle_tpl/bundle.yaml
index 8f1c5546..9343e5be 100644
--- a/ci/bundle_tpl/bundle.yaml
+++ b/ci/bundle_tpl/bundle.yaml
@@ -1,34 +1,23 @@
 # vim: set ts=2 et:
 {{ ubuntu.release }}-{{ os.release }}-nodes:
   inherits: openstack-phase1
-
-
-{{ ubuntu.release }}-{{ os.release }}:
-  inherits: openstack-phase2
   overrides:
 {% include 'phase2-overrides.yaml' %}
 
+{{ ubuntu.release }}-{{ os.release }}:
+  inherits: openstack-phase2
 
 openstack-phase1:
   services:
     nodes:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
+{% if os.ha.mode == 'ha' %}
+      num_units: 5
+{% else %}
       num_units: 2
+{% endif %}
     ntp:
       charm: "local:{{ ubuntu.release }}/ntp"
-  relations:
-    - - "ntp:juju-info"
-      - "nodes:juju-info"
-
-
-openstack-phase2:
-  inherits: openstack-phase1
-  relations:
-{% include 'relations.yaml' %}
-  services:
-{% if os.ha.mode == 'ha' %}
-    {% include 'haclusters.yaml' %}
-{% endif %}
 {% include 'mysql.yaml' %}
 {% include 'ceilometer.yaml' %}
 {% include 'ceph.yaml' %}
@@ -43,5 +32,21 @@ openstack-phase2:
 {% include 'heat.yaml' %}
 {% include 'neutron-api.yaml' %}
 {% include 'neutron-gateway.yaml' %}
-{% if os.network.controller == 'nosdn' %}{% include 'neutron-ovs.yaml' %}
-{% elif os.network.controller == 'odl' %}{% include 'odl.yaml' %}{% endif %}
+{% if os.network.controller == 'odl' %}{% include 'odl.yaml' %}{% endif %}
+{% if os.ha.mode == 'ha' %}
+    {% include 'haclusters.yaml' %}
+{% endif %}
+
+  relations:
+    - - "ntp:juju-info"
+      - "nodes:juju-info"
+{% if os.ha.mode == 'ha' %}
+    {% include 'harelations.yaml' %}
+{% endif %}
+
+openstack-phase2:
+  inherits: openstack-phase1
+  relations:
+{% include 'relations.yaml' %}
+  services:
+{% include 'subordinate.yaml' %}
diff --git a/ci/bundle_tpl/ceilometer.yaml b/ci/bundle_tpl/ceilometer.yaml
index f76a7c7d..125e8382 100644
--- a/ci/bundle_tpl/ceilometer.yaml
+++ b/ci/bundle_tpl/ceilometer.yaml
@@ -1,5 +1,3 @@
-    ceilometer-agent:
-      charm: "local:{{ ubuntu.release }}/ceilometer-agent"
     mongodb:
       charm: local:{{ ubuntu.release }}/mongodb
       to:
diff --git a/ci/bundle_tpl/ceph.yaml b/ci/bundle_tpl/ceph.yaml
index 725ac705..de06f9f7 100644
--- a/ci/bundle_tpl/ceph.yaml
+++ b/ci/bundle_tpl/ceph.yaml
@@ -35,6 +35,4 @@
 {% for unit_id in to_select(unit_qty() if os.beta.hacluster_ceph_radosgw else 1) %}
         - "lxc:nodes={{ unit_id }}"
 {% endfor %}
-    cinder-ceph:
-      charm: "local:{{ ubuntu.release }}/cinder-ceph"
 {% endif %}
diff --git a/ci/bundle_tpl/cinder.yaml b/ci/bundle_tpl/cinder.yaml
index 6113200a..d28ecd76 100644
--- a/ci/bundle_tpl/cinder.yaml
+++ b/ci/bundle_tpl/cinder.yaml
@@ -4,7 +4,6 @@
       options:
         block-device: None
         glance-api-version: 2
-        ha-mcastport: 5401
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.cinder }}
 {% endif %}
diff --git a/ci/bundle_tpl/glance.yaml b/ci/bundle_tpl/glance.yaml
index c571760b..f4fcbf00 100644
--- a/ci/bundle_tpl/glance.yaml
+++ b/ci/bundle_tpl/glance.yaml
@@ -2,7 +2,6 @@
       charm: "local:{{ ubuntu.release }}/glance"
       num_units: {{ unit_qty() }}
       options:
-        ha-mcastport: 5402
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.glance }}
 {% endif %}
diff --git a/ci/bundle_tpl/haclusters.yaml b/ci/bundle_tpl/haclusters.yaml
index c21ec545..ef193654 100644
--- a/ci/bundle_tpl/haclusters.yaml
+++ b/ci/bundle_tpl/haclusters.yaml
@@ -1,52 +1,53 @@
+
     hacluster-keystone:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-cinder:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'cc6n5Zv6M2mQ2mUhTx/aKoImQ7q77pKDdkSwBUG5VqoSb23SxnGUsAxH5E8lOeCZ84EURzS71FEb8F9P5YY+2deh0+tdXukoKTugdVmJfarahPpWpEEZRRCigUngdFw/479FOcFCkN1SJtQNqWi1ACYSn1/GRoQ2vP+2byrkV6E='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-heat:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'tNeFXmOqzytRq7loxLMDaaMqZZXjC7BNfMbcKxSNeIPyBj4lkJwHZyuV7mo0ogzcfVJqLBHBULai+ed9uyWCZJxLXoi+WwTj5AqcXfxfSo9vLCthukJJ4zuKvzeGibZRszwINf32RW9jtXSCPosv8a+9MSg49KD1c9fS20aEuIM='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-horizon:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-nova:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-neutron:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-glance:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-ceilometer:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
+        corosync_transport: unicast
+        cluster_count: 3
     hacluster-mysql:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K'
+        corosync_transport: unicast
+        cluster_count: 3
 {% if os.beta.hacluster_ceph_radosgw %}
     hacluster-ceph-radosgw:
       charm: "local:{{ ubuntu.release }}/hacluster"
       options:
-        corosync_key: |
-          'tk8U/FkH1+dNsvj6IU0C8AST7i/9ylIoCD8kWpPjB+UE2AYR7tkgkjnc4m5dzIYPYTceY7Hnb9xLJ0nlcQLYYFBRAJOg3drNTcVrfh63y9g9La1J1r51YSbOqXq1Q6RUhxP4OQBtDGE6/4NtZwuRPvPGLcI2ENiVm78l8JFkXRw='
+        corosync_transport: unicast
+        cluster_count: 3
 {% endif %}
diff --git a/ci/bundle_tpl/harelations.yaml b/ci/bundle_tpl/harelations.yaml
new file mode 100644
index 00000000..0a455e98
--- /dev/null
+++ b/ci/bundle_tpl/harelations.yaml
@@ -0,0 +1,25 @@
+{% if os.ha.mode == 'ha' %}
+
+    - - mysql:ha
+      - hacluster-mysql:ha
+    - - cinder:ha
+      - hacluster-cinder:ha
+    - - heat:ha
+      - hacluster-heat:ha
+    - - glance:ha
+      - hacluster-glance:ha
+    - - keystone:ha
+      - hacluster-keystone:ha
+    - - neutron-api:ha
+      - hacluster-neutron:ha
+    - - nova-cloud-controller:ha
+      - hacluster-nova:ha
+    - - openstack-dashboard:ha
+      - hacluster-horizon:ha
+    - - heat:ha
+      - hacluster-heat:ha
+{% if os.beta.hacluster_ceph_radosgw %}
+    - - ceph-radosgw:ha
+      - hacluster-ceph-radosgw:ha
+{% endif %}
+{% endif %}
diff --git a/ci/bundle_tpl/keystone.yaml b/ci/bundle_tpl/keystone.yaml
index 18f5cc63..147bdc3f 100644
--- a/ci/bundle_tpl/keystone.yaml
+++ b/ci/bundle_tpl/keystone.yaml
@@ -4,7 +4,6 @@
       options:
         admin-password: {{ opnfv.admin_password | default(os.admin.password) }}
         admin-token: {{ os.admin.name }}
-        ha-mcastport: 5403
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.keystone }}
 {% endif %}
diff --git a/ci/bundle_tpl/neutron-api.yaml b/ci/bundle_tpl/neutron-api.yaml
index 403babcf..3942fe23 100644
--- a/ci/bundle_tpl/neutron-api.yaml
+++ b/ci/bundle_tpl/neutron-api.yaml
@@ -3,7 +3,9 @@
       num_units: {{ unit_qty() }}
       options:
         neutron-security-groups: true
-        flat-network-providers: "*"
+{% if os.network.controller == 'nosdn' %}
+        overlay-network-type: vxlan
+{% endif %}
 {% if os.network.controller == 'odl' %}
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
diff --git a/ci/bundle_tpl/neutron-gateway.yaml b/ci/bundle_tpl/neutron-gateway.yaml
index 65cfab80..f1eadc3c 100644
--- a/ci/bundle_tpl/neutron-gateway.yaml
+++ b/ci/bundle_tpl/neutron-gateway.yaml
@@ -1,6 +1,5 @@
     neutron-gateway:
       charm: "local:{{ ubuntu.release }}/neutron-gateway"
-      num_units: 1
       options:
 {% if opnfv.ext_port is defined  %}
         ext-port: {{ opnfv.ext_port }}
diff --git a/ci/bundle_tpl/neutron-ovs.yaml b/ci/bundle_tpl/neutron-ovs.yaml
index 1670d43c..ba0b6a5b 100644
--- a/ci/bundle_tpl/neutron-ovs.yaml
+++ b/ci/bundle_tpl/neutron-ovs.yaml
@@ -1,6 +1,5 @@
     neutron-openvswitch:
-      charm: "local:{{ ubuntu.release }}/neutron-openvswitch"
-      num_units: 1
+      charm: local:{{ ubuntu.release }}/neutron-openvswitch
       options:
 {% if os.network.dpdk %}
         enable-dpdk: true
diff --git a/ci/bundle_tpl/nova-cloud-controller.yaml b/ci/bundle_tpl/nova-cloud-controller.yaml
index 8b0e3c16..4f51c30c 100644
--- a/ci/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/bundle_tpl/nova-cloud-controller.yaml
@@ -7,7 +7,6 @@
         console-proxy-ip: {{ opnfv.domain }}
 {% endif %}
         network-manager: Neutron
-        service-guard: true
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.nova }}
 {% endif %}
diff --git a/ci/bundle_tpl/nova-compute.yaml b/ci/bundle_tpl/nova-compute.yaml
index e6305d4c..2f23816e 100644
--- a/ci/bundle_tpl/nova-compute.yaml
+++ b/ci/bundle_tpl/nova-compute.yaml
@@ -1,6 +1,6 @@
     nova-compute:
       charm: "local:{{ ubuntu.release }}/nova-compute"
-      num_units: {{ opnfv.units }}
+      num_units: {{ opnfv.units - 1 }}
       options:
         enable-live-migration: true
         enable-resize: true
@@ -13,6 +13,6 @@
         virt-type: lxd
 {% endif %}
       to:
-{% for unit_id in to_select(opnfv.units) %}
-        - "nodes={{ unit_id }}"
+{% for unit_id in to_select(opnfv.units - 1) %}
+        - "nodes={{ unit_id + 1 }}"
 {% endfor %}
diff --git a/ci/bundle_tpl/odl.yaml b/ci/bundle_tpl/odl.yaml
index 96568d4f..8705c934 100644
--- a/ci/bundle_tpl/odl.yaml
+++ b/ci/bundle_tpl/odl.yaml
@@ -7,10 +7,3 @@
         https-proxy: "http://squid.internal:3128"
       to:
         - "lxc:nodes=0"
-    neutron-api-odl:
-      charm: local:{{ ubuntu.release }}/neutron-api-odl
-      options:
-        overlay-network-type: 'vxlan'
-        security-groups: True
-    openvswitch-odl:
-      charm: local:{{ ubuntu.release }}/openvswitch-odl
diff --git a/ci/bundle_tpl/phase2-overrides.yaml b/ci/bundle_tpl/phase2-overrides.yaml
index 8ec13f70..c2b8ff9a 100644
--- a/ci/bundle_tpl/phase2-overrides.yaml
+++ b/ci/bundle_tpl/phase2-overrides.yaml
@@ -1,10 +1,12 @@
 {% if opnfv.spaces_dict.data is defined %}
-    os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+    os-data-network: {{ opnfv.dataNetwork }}
 {% endif %}
 {% if opnfv.spaces_dict.storage is defined %}
-    ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
+    #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
 {% endif %}
+{% if os.network.ipv6 == 'true' %}
     prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
 {% if os.network.dvr %}
     enable-dvr: true
 {% endif %}
@@ -12,12 +14,18 @@
     l2-population: true
 {% endif %}
     region: {{ os.region }}
-    #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.release == 'trusty' %}
+    source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% endif %}
     openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.ha.mode == 'nonha' %}
     ceph-osd-replication-count: {{ os.storage.ceph_replica }}
-    admin-role: {{ os.admin_role }}
-    keystone-admin-role: {{ os.admin_role }}
+{% endif %}
+    admin-role: {{ os.admin.role }}
+    keystone-admin-role: {{ os.admin.role }}
 {% if os.beta.public_api %}
     use-internal-endpoints: true
+{% if opnfv.domain is defined %}
     os-public-hostname: api.{{ opnfv.domain }}
 {% endif %}
+{% endif %}
diff --git a/ci/bundle_tpl/relations.yaml b/ci/bundle_tpl/relations.yaml
index ddfa2fe4..98b3d317 100644
--- a/ci/bundle_tpl/relations.yaml
+++ b/ci/bundle_tpl/relations.yaml
@@ -1,27 +1,3 @@
-{% if os.ha.mode == 'ha' %}
-    - - mysql:ha
-      - hacluster-mysql:ha
-    - - cinder:ha
-      - hacluster-cinder:ha
-    - - heat:ha
-      - hacluster-heat:ha
-    - - glance:ha
-      - hacluster-glance:ha
-    - - keystone:ha
-      - hacluster-keystone:ha
-    - - neutron-api:ha
-      - hacluster-neutron:ha
-    - - nova-cloud-controller:ha
-      - hacluster-nova:ha
-    - - openstack-dashboard:ha
-      - hacluster-horizon:ha
-    - - heat:ha
-      - hacluster-heat:ha
-{% if os.beta.hacluster_ceph_radosgw %}
-    - - ceph-radosgw:ha
-      - hacluster-ceph-radosgw:ha
-{% endif %}
-{% endif %}
     - - nova-compute:amqp
       - rabbitmq-server:amqp
     - - neutron-gateway:amqp
diff --git a/ci/bundle_tpl/subordinate.yaml b/ci/bundle_tpl/subordinate.yaml
new file mode 100644
index 00000000..1391ad85
--- /dev/null
+++ b/ci/bundle_tpl/subordinate.yaml
@@ -0,0 +1,28 @@
+    ceilometer-agent:
+      charm: local:{{ ubuntu.release }}/ceilometer-agent
+{% if opnfv.storage_dict.ceph is defined %}
+    cinder-ceph:
+      charm: local:{{ ubuntu.release }}/cinder-ceph
+{% endif %}
+{% if os.network.controller == 'nosdn' %}{% include 'neutron-ovs.yaml' %}
+{% elif os.network.controller == 'odl' %}
+    neutron-api-odl:
+      charm: local:{{ ubuntu.release }}/neutron-api-odl
+      options:
+        overlay-network-type: 'vxlan'
+        security-groups: True
+    openvswitch-odl:
+      charm: local:{{ ubuntu.release }}/openvswitch-odl
+{% elif os.network.controller == 'nons' %}
+    openvswitch-onos:
+      charm: local:{{ ubuntu.release }}/openvswitch-onos
+    neutron-api-onos:
+      charm: local:{{ ubuntu.release }}/neutron-api-onos
+      options:
+        overlay-network-type: 'vxlan'
+        security-groups: True
+{% endif %}
+{% if os.lxd is defined %}
+    lxd:
+      charm: local:{{ ubuntu.release }}/lxd
+{% endif %}