modfied to take care of OCL deployment

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

5 files changed, 40 insertions, 272 deletions

diff --git a/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml b/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml
deleted file mode 100644
index a8dbd400..00000000
--- a/ci/config_tpl/juju2/bundle_tpl/phase2-overrides.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{% if opnfv.spaces_dict.storage is defined %}
-    #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
-{% endif %}
-{% if os.network.ipv6 %}
-    #prefer-ipv6: {{ os.network.ipv6 }}
-{% endif %}
-{% if os.ha.mode == 'ha' %}
-{% if os.api.haproxy_timeout %}
-    #haproxy-server-timeout: {{ os.api.haproxy_timeout }}
-    #haproxy-client-timeout: {{ os.api.haproxy_timeout }}
-    #haproxy-queue-timeout: {{ os.api.haproxy_timeout }}
-    #haproxy-connect-timeout: {{ os.api.haproxy_timeout }}
-{% endif %}
-{% endif %}
-{% if os.api.worker_multiplier %}
-    #worker-multiplier: {{ os.api.worker_multiplier }}
-{% endif %}
-{% if os.network.dvr %}
-    #enable-dvr: true
-{% endif %}
-{% if os.network.l2_population %}
-    #l2-population: true
-{% endif %}
-{% if ubuntu.release == 'trusty' %}
-    #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-{% endif %}
-{% if ubuntu.release == 'xenial' %}
-{% if os.release == 'newton' %}
-    #source: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-{% endif %}
-{% endif %}
-{% if os.ha.mode == 'nonha' %}
-{% if opnfv.storage_dict.ceph is defined %}
-    #ceph-osd-replication-count: {{ unit_ceph_qty() }}
-{% endif %}
-{% endif %}
-    #admin-role: {{ os.admin.role }}
-    #keystone-admin-role: {{ os.admin.role }}
-{% if os.beta.public_api %}
-    #use-internal-endpoints: true
-{% endif %}
diff --git a/ci/opencontrail/README b/ci/opencontrail/README
deleted file mode 100644
index 4334818d..00000000
--- a/ci/opencontrail/README
+++ /dev/null
@@ -1,115 +0,0 @@
-OpenContrail Deployment with Juju
-=================================
-
-This readme contains instructions for checking out and deploying Juju charms for
-OpenContrail.
-
-The charms are targetted at Trusty but originally used OpenContrail Precise
-packages.
-
-
-Checkout charms
----------------
-
-Charms are hosted on Launchpad.
-You need to 'sudo apt-get install bzr' first.
-
-Follow these steps to checkout code:
-
-cd <deployer dir>
-./fetch-charms.sh
-
-This will checkout the relevant charms into 'src' and create any Juju symlinks
-in 'charms'.
-
-
-Deploy with cloud-sh-contrail
------------------------------
-
-cloud-sh-contrail is a collection of development shell scripts to deploy
-and setup OpenStack with OpenContrail using Juju's local provider. This will
-create 3 KVMs as follows:
-
-*KVM #1 - Keystone, Glance, Neutron Server, Nova Cloud Controller, Horizon,
-          MySQL, RabbitMQ, Contrail Configuration, Contrail Control,
-          Contrail Analytics, Contrail Web UI, Zookeeper
-
-*KVM #2 - Nova Compute with Contrail vRouter
-
-*KVM #3 - Cassandra
-
-You'll require approx. 25Gb RAM with 60Gb+ disk space.
-Deployment can take anywhere between 20 mins to 1 hour.
-
-You need to 'sudo apt-get install juju juju-local uvtool', and
-logout/login in order to pick up libvirt group permissions before
-proceeding. See https://bugs.launchpad.net/juju-core/+bug/1308088.
-
-Follow these steps:
-
-ssh-keygen
-  (if you don't already have a key at ~/.ssh/id_rsa).
-
-cp cloud-sh-contrail/environments.yaml ~/.juju
-  (or create your own default local environment in your existing
-   environments.yaml file)
-
-cd cloud-sh-contrail
-
-./deploy-trusty.sh (deploys under trusty)
-or
-./deploy-precise.sh (deploys under precise)
-
-This will log to 'out.log'.
-
-This will deploy OpenStack and import Trusty's daily image into Glance.
-
-Horizon will be located on the machine 'juju status openstack-dashboard' -
-http://<ip>/horizon.
-
-Contrail Web UI will be located on the machine 'juju status contrail-webui' -
-http://<ip>:8080.
-
-Admin credentials will be written to cloud/admin-openrc.
-
-Upon deployment, the host's route and iptables config will be updated to send
-NAT'ed traffic to the Nova Compute node hosting Contrail's virtual gateway.
-Such changes can be disabled by not defining or commenting out the variable
-'CONFIGURE_HOST_ROUTING' in cloud-sh-contrail/config-*.sh.
-
-The deployment can be destroyed with:
-
-juju destroy-environment local
-
-
-Deploy with Juju Deployer
--------------------------
-
-Juju Deployer can deploy a preset configuration of charms given a yaml
-configuration file. There is a configuration file in
-'juju-deployer/contrail.yaml'.
-
-You need to 'sudo apt-get install juju-deployer' first.
-
-Then:
-
-cd juju-deployer
-
-juju-deployer -c contrail.yaml -d trusty-icehouse-contrail (deploy trusty)
-or
-juju-deployer -c contrail.yaml -d precise-icehouse-contrail (deploy precise)
-
-Juju Deployer will branch its own copy of the remote charms.
-
-Post-deployment scripts exist to configure OpenStack.
-You will need 'dnsutils' package installed beforehand.
-To run:
-
-cd scripts
-
-CONFIGURE_HOST_ROUTING=true ./openstack.sh
-
-Setting 'CONFIGURE_HOST_ROUTING' environment variable will configure the host's
-route and iptables config to send NAT'ed traffic to the Nova Compute node
-hosting Contrail's virtual gateway. If you do not want this, run
-'./openstack.sh' directly.
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 1ee385f6..211624c4 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -1,7 +1,6 @@
 #!/bin/bash -ex
 
 distro=$1
-mkdir precise
 mkdir -p $distro
 
 function build {
@@ -12,16 +11,12 @@ function build {
 
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-charm pull cs:trusty/mongodb $distro/mongodb
-charm pull cs:$distro/haproxy $distro/haproxy
-charm pull cs:$distro/ntp $distro/ntp
-charm pull cs:$distro/aodh $distro/aodh
-charm pull cs:~narindergupta/congress-1 $distro/congress
+bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
+bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
 
 git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-#bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
-#git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-#git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
 git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
 git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
 git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
@@ -30,16 +25,21 @@ git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $di
 git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance
 git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone
 git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
 git clone -b stable/17.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-#git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
 git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
 git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
 git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat
-git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+git clone https://github.com/openstack/charm-lxd.git $distro/lxd
 git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
 
+charm pull cs:$distro/aodh $distro/aodh
+charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy
+charm pull cs:~narindergupta/congress-1 $distro/congress
+
 #pulling scaleio charms.
 charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm
 charm pull cs:~cloudscaling/scaleio-sds $distro/scaleio-sds
@@ -49,30 +49,9 @@ charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack
 charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster
 charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui
 
-#charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
-#charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
-#charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
-#charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
-#charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
-#charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
-#charm pull cs:~openstack-charmers-next/cinder $distro/cinder
-#charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
-#charm pull cs:~openstack-charmers-next/glance $distro/glance
-#charm pull cs:~openstack-charmers-next/keystone $distro/keystone
-#charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
-#charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
-#charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
-#charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
-#charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
-#charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
-#charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
-#charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
-#charm pull cs:~openstack-charmers-next/heat $distro/heat
-#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
+git clone https://github.com/Juniper/contrail-charms.git
+cd contrail-charms/
+mv * ../$distro/
+cd ../
+rm -rf contrail-charms/
 
-# Controller specific charm
-git clone https://git.opnfv.org/ovno.git
-cd ovno/charms/trusty
-mv * ../../../$distro/
-cd ../../../
-rm -rf ovno
diff --git a/ci/opencontrail/fetch-charmsnew.sh b/ci/opencontrail/fetch-charmsnew.sh
deleted file mode 100755
index 98884df8..00000000
--- a/ci/opencontrail/fetch-charmsnew.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash -ex
-
-distro=$1
-mkdir -p $distro
-
-function build {
-    sudo apt-get install charm-tools -y
-    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
-    mv $distro/charm-$1/build/$distro/$1 $distro
-}
-
-# openstack
-bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
-bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
-bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp
-
-git clone -b stable/17.02 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone -b stable/17.02 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone -b stable/17.02 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone -b stable/17.02 https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone -b stable/17.02 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone -b stable/17.02 https://github.com/openstack/charm-glance.git $distro/glance
-git clone -b stable/17.02 https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone -b stable/17.02 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone -b stable/17.02 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone -b stable/17.02 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone -b stable/17.02 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone -b stable/17.02 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone -b stable/17.02 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone -b stable/17.02 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone -b stable/17.02 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone -b stable/17.02 https://github.com/openstack/charm-heat.git $distro/heat
-git clone https://github.com/openstack/charm-lxd.git $distro/lxd
-git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
-
-charm pull cs:$distro/aodh $distro/aodh
-charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy
-charm pull cs:~narindergupta/congress-1 $distro/congress
-
-#pulling scaleio charms.
-charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm
-charm pull cs:~cloudscaling/scaleio-sds $distro/scaleio-sds
-charm pull cs:~cloudscaling/scaleio-gw $distro/scaleio-gw
-charm pull cs:~cloudscaling/scaleio-sdc $distro/scaleio-sdc
-charm pull cs:~cloudscaling/scaleio-openstack $distro/scaleio-openstack
-charm pull cs:~cloudscaling/scaleio-cluster $distro/scaleio-cluster
-charm pull cs:~cloudscaling/scaleio-gui $distro/scaleio-gui
-
-git clone https://github.com/Juniper/contrail-charms.git
-cd contrail-charms/
-mv * ../$distro/
-cd ../
diff --git a/labconfig/juniper/pod1/labconfig.yaml b/labconfig/juniper/pod1/labconfig.yaml
index 107d1c2b..87e2577c 100644
--- a/labconfig/juniper/pod1/labconfig.yaml
+++ b/labconfig/juniper/pod1/labconfig.yaml
@@ -7,11 +7,11 @@ lab:
       architecture: x86_64
       roles: [compute,storage]
       nics:
-      - ifname: eth0
+      - ifname: intf100
         spaces: [admin]
         mac: ["0c:c4:7a:53:57:c2"]
-      - ifname: eth1
-        spaces: [public]
+      - ifname: intf101
+        spaces: [floating]
         mac: ["0c:c4:7a:53:57:c3"]
       power:
         type: ipmi
@@ -22,11 +22,11 @@ lab:
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth0
+      - ifname: intf100
         spaces: [admin]
         mac: ["0c:c4:7a:16:2a:70"]
-      - ifname: eth1
-        spaces: [public]
+      - ifname: intf101
+        spaces: [floating]
         mac: ["0c:c4:7a:16:2a:71"]
       power:
         type: ipmi
@@ -37,11 +37,11 @@ lab:
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth0
+      - ifname: intf100
         spaces: [admin]
         mac: ["0c:c4:7a:16:2a:0a"]
-      - ifname: eth1
-        spaces: [public]
+      - ifname: intf101
+        spaces: [floating]
         mac: ["0c:c4:7a:16:2a:0b"]
       power:
         type: ipmi
@@ -52,11 +52,11 @@ lab:
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth0
+      - ifname: intf100
         spaces: [admin]
         mac: ["0c:c4:7a:16:22:9c"]
-      - ifname: eth1
-        spaces: [public]
+      - ifname: intf101
+        spaces: [floating]
         mac: ["0c:c4:7a:16:22:9d"]
       power:
         type: ipmi
@@ -67,11 +67,11 @@ lab:
       architecture: x86_64
       roles: [compute,storage]
       nics:
-      - ifname: eth0
+      - ifname: intf100
         spaces: [admin]
         mac: ["0c:c4:7a:53:57:16"]
-      - ifname: eth1
-        spaces: [public]
+      - ifname: intf101
+        spaces: [floating]
         mac: ["0c:c4:7a:53:57:17"]
       power:
         type: ipmi
@@ -79,28 +79,28 @@ lab:
         user: ADMIN
         pass: ADMIN
     floating-ip-range: 10.10.10.6,10.10.10.250,10.10.10.1,10.10.10.0/24
-    ext-port: "br-eth1"
+    ext-port: "intf101"
     dns: 8.8.8.8
     osdomainname:
 opnfv:
-    release: c
-    distro: trusty
-    type: nonha
-    openstack: mitaka
+    release: d
+    distro: xenial
+    type: ha
+    openstack: ocata
     sdncontroller:
-    - type: nosdn
+    - type: ocl
     storage:
     - type: ceph
       disk: /srv
-    feature: odl_l2
+    feature: nofeature
     spaces:
     - type: admin
       bridge: brAdm
       cidr: 172.16.50.0/24
       gateway: 172.16.50.1
       vlan:
-    - type: public
+    - type: floating
       bridge: brPublic
       cidr: 10.10.10.0/24
-      gateway: 10.10.10.1
+      gateway:
       vlan: