Merge "Set default branch for Congress to stable/mitaka"

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index e3bc99f..62e57da 100755 (executable)
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -251,6 +251,7 @@ enable_if(){
       enableiflist=`grep "interface-enable" deployconfig.yaml | cut -d ' ' -f 4 `
       datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
       stornet=`grep "storageNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
+      pubnet=`grep "publicNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
 
       # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
 
@@ -268,7 +269,16 @@ enable_if(){
           i="0"
           while [ ! -z "${EXTNET[i]}" ];
           do
-              echo enableautomode ${EXTNET[i]} AUTO $stornet || true
+              enableautomode ${EXTNET[i]} AUTO $stornet || true
+              i=$[$i+1]
+          done
+      fi
+      if [ "$pubnet" != "''" ]; then
+          EXTNET=(${enableiflist//,/ })
+          i="0"
+          while [ ! -z "${EXTNET[i]}" ];
+          do
+              enableautomode ${EXTNET[i]} AUTO $pubnet || true
               i=$[$i+1]
           done
       fi

diff --git a/ci/deploy.py b/ci/deploy.py
index 65e1924..99dce0d 100644 (file)
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -54,7 +54,7 @@ opnfvcfg['demo-maas']={'juju-bootstrap':{'memory': 4096,'name': "bootstrap",\
                       }
 
 opnfvlabcfg['opnfv']={'ext-port':'','floating-ip-range':'','dataNetwork':'','ceph-disk':'/srv/',\
-                      'storageNetwork':'','interface-enable':""}
+                      'storageNetwork':'','interface-enable':'','publicNetwork':''}
 
 opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:maas/stable")
 opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:juju/stable")
@@ -88,6 +88,7 @@ while c < len(labcfg["opnfv"]["spaces"]):
         brgway = getFromDict(labcfg, ["opnfv","spaces",c,"gateway"])
         tmpcidr = brcidr[:-4]
         opnfvlabcfg["opnfv"]["admNetwork"]=tmpcidr+"2"
+        opnfvlabcfg["opnfv"]["admNetgway"]=brgway
 
         nodegroup={"device": "eth"+str(y), "ip": tmpcidr+"5","subnet_mask": "255.255.255.0", \
                    "broadcast_ip": tmpcidr+"255", "router_ip": brgway,\
@@ -132,6 +133,7 @@ while c < len(labcfg["opnfv"]["spaces"]):
             y=y+1
         if brtype == "public":
             opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio")
+            opnfvlabcfg["opnfv"]["publicNetwork"]=brcidr
         if brtype == "external":
             ipaddress = getFromDict(labcfg, ["opnfv","spaces",c,"ipaddress"])
             ethbrAdm  = (ethbrAdm+'\n'

diff --git a/ci/deploy.sh b/ci/deploy.sh
index b81673c..b91e761 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -156,7 +156,7 @@ check_status
 echo "...... deployment finished  ......."
 
 if [ "$opnfvsdn" == "onos" ]; then
-    ./openstack.sh "$opnfvlab"
+    ./openstack.sh "$opnfvsdn"
     check_status
 else
     #create the basic data for verification of stack.

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 662f190..3092929 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -137,6 +137,12 @@ openstack-phase2:
       - rabbitmq-server:amqp
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
 
   services:
     hacluster-keystone:
@@ -336,3 +342,9 @@ openstack-phase2:
       charm: "local:trusty/heat"
       to:
         - "lxc:nodes=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=0"

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 6ae2fc2..cac7637 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -123,6 +123,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -259,3 +265,9 @@ openstack-phase2:
         #default-socket-memory: 1024
         #defualt-socket-cores: 1
         #dpdk-driver: uio_pci_generic
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=1"

diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index b9e30e3..8d29e05 100755 (executable)
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -1,8 +1,14 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 distro=$1
 mkdir -p $distro
 
+function build {
+    sudo apt-get install charm-tools -y
+    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
+    mv $distro/charm-congress/build/$distro/congress $distro
+}
+
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -26,9 +32,10 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu
 git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
+build
 
 #controller specific charm
 git clone https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
 git clone https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
 git clone https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
-

diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 39864ff..9a24bdc 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -64,9 +64,9 @@ openstack-phase2:
     - - "neutron-api-odl:odl-controller"
       - "odl-controller:controller-api"
     - - "keystone:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "nova-cloud-controller:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "nova-cloud-controller:amqp"
       - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:image-service"
@@ -80,7 +80,7 @@ openstack-phase2:
     - - "nova-compute:image-service"
       - "glance:image-service"
     - - "glance:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "glance:identity-service"
       - "keystone:identity-service"
     - - "glance:amqp"
@@ -88,7 +88,7 @@ openstack-phase2:
     - - "openstack-dashboard:identity-service"
       - "keystone:identity-service"
     - - "neutron-api:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "neutron-api:amqp"
       - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:neutron-api"
@@ -114,7 +114,7 @@ openstack-phase2:
     - - "ceilometer:shared-db"
       - "mongodb:database"
     - - "heat:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "heat:identity-service"
       - "keystone:identity-service"
     - - "heat:amqp"
@@ -132,7 +132,7 @@ openstack-phase2:
     - - "ceph:client"
       - "nova-compute:ceph"
     - - "cinder:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "ceph:client"
       - "cinder-ceph:ceph"
     - - "ceph:client"
@@ -145,6 +145,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     hacluster-keystone:
       charm: "local:trusty/hacluster"
@@ -191,7 +197,7 @@ openstack-phase2:
 #      options:
 #        corosync_key: |
 #          'tk8U/FkH1+dNsvj6IU0C8AST7i/9ylIoCD8kWpPjB+UE2AYR7tkgkjnc4m5dzIYPYTceY7Hnb9xLJ0nlcQLYYFBRAJOg3drNTcVrfh63y9g9La1J1r51YSbOqXq1Q6RUhxP4OQBtDGE6/4NtZwuRPvPGLcI2ENiVm78l8JFkXRw='
-    percona-cluster:
+    mysql:
       charm: "local:trusty/percona-cluster"
       num_units: 3
       options:
@@ -393,3 +399,9 @@ openstack-phase2:
         security-groups: True
     openvswitch-odl:
       charm: local:trusty/openvswitch-odl
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=0"

diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index fc9e9ed..d414ba0 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -127,6 +127,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -257,7 +263,7 @@ openstack-phase2:
     opnfv-promise:
       branch: lp:~narindergupta/charms/trusty/promise/trunk
       to:
-        - "lxc:nodes=1"
+        - "lxc:nodes=0"
     neutron-api-odl:
       charm: local:trusty/neutron-api-odl
       options:
@@ -265,3 +271,9 @@ openstack-phase2:
         security-groups: True
     openvswitch-odl:
       charm: local:trusty/openvswitch-odl
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=1"

diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index ed34e93..e721f7d 100644 (file)
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -129,6 +129,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -273,3 +279,9 @@ openstack-phase2:
         security-groups: True
     openvswitch-odl:
       charm: local:trusty/openvswitch-odl
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=0"

diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index f447fff..262e44d 100755 (executable)
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -1,8 +1,14 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 distro=$1
 mkdir -p $distro
 
+function build {
+    sudo apt-get install charm-tools -y
+    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
+    mv $distro/charm-congress/build/$distro/congress $distro
+}
+
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -25,6 +31,8 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu
 git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
+build
 
 # Controller specific charm
 bzr branch lp:~wuwenbin2/onosfw/onos-controller $distro/onos-controller

diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 0d7a2b9..120ed3c 100644 (file)
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -58,9 +58,9 @@ openstack-phase2:
     - - "neutron-api-onos:onos-controller"
       - "onos-controller:controller-api"
     - - "keystone:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "nova-cloud-controller:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "nova-cloud-controller:amqp"
       - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:image-service"
@@ -74,7 +74,7 @@ openstack-phase2:
     - - "nova-compute:image-service"
       - "glance:image-service"
     - - "glance:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "glance:identity-service"
       - "keystone:identity-service"
     - - "glance:amqp"
@@ -82,7 +82,7 @@ openstack-phase2:
     - - "openstack-dashboard:identity-service"
       - "keystone:identity-service"
     - - "neutron-api:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "neutron-api:amqp"
       - "rabbitmq-server:amqp"
     - - "nova-cloud-controller:neutron-api"
@@ -108,7 +108,7 @@ openstack-phase2:
     - - "ceilometer:shared-db"
       - "mongodb:database"
     - - "heat:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "heat:identity-service"
       - "keystone:identity-service"
     - - "heat:amqp"
@@ -126,7 +126,7 @@ openstack-phase2:
     - - "ceph:client"
       - "nova-compute:ceph"
     - - "cinder:shared-db"
-      - "percona-cluster:shared-db"
+      - "mysql:shared-db"
     - - "ceph:client"
       - "cinder-ceph:ceph"
     - - "ceph:client"
@@ -139,7 +139,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
-
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     hacluster-keystone:
       charm: "local:trusty/hacluster"
@@ -171,7 +176,7 @@ openstack-phase2:
       options:
         corosync_key: |
           'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
-    percona-cluster:
+    mysql:
       charm: "local:trusty/percona-cluster"
       num_units: 3
       options:
@@ -355,3 +360,9 @@ openstack-phase2:
         security-groups: True
     openvswitch-onos:
       charm: "local:trusty/openvswitch-onos"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=0"

diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index 31a7e15..7682561 100644 (file)
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -127,6 +127,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -261,3 +267,9 @@ openstack-phase2:
         security-groups: True
     openvswitch-onos:
       charm: "local:trusty/openvswitch-onos"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=0"

diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index 8b4cd6d..ff53bb4 100644 (file)
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -125,7 +125,12 @@ openstack-phase2:
       - "keystone:identity-service"
     #- - nova-compute:lxd
       #- lxd:lxd
-
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
   services:
     mysql:
       charm: "local:trusty/percona-cluster"
@@ -266,3 +271,9 @@ openstack-phase2:
         security-groups: True
     openvswitch-onos:
       charm: "local:trusty/openvswitch-onos"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes=0"

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index c64eb4a..c46fee2 100755 (executable)
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -1,9 +1,15 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
 distro=$1
 mkdir precise
 mkdir -p $distro
 
+function build {
+    sudo apt-get install charm-tools -y
+    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
+    mv $distro/charm-congress/build/$distro/congress $distro
+}
+
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -28,6 +34,8 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu
 git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
 git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
 git clone https://github.com/openstack/charm-heat.git $distro/heat
+git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
+build
 
 # Controller specific charm
 bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 99936e7..65c9046 100644 (file)
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -40,7 +40,7 @@ openstack-phase1:
 openstack-phase2:
   inherits: openstack-phase1
   services:
-    percona-cluster:
+    mysql:
       branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
       num_units: 3
       options:
@@ -227,7 +227,13 @@ openstack-phase2:
       branch: lp:~narindergupta/charms/trusty/promise/trunk
       num_units: 1
       to:
-        - "lxc:nodes-api=2"
+        - "lxc:nodes-api=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes-api=0"
   relations:
     - [ "glance:ha", "hacluster-glance:ha" ]
     - [ "keystone:ha", "hacluster-keystone:ha" ]
@@ -235,19 +241,19 @@ openstack-phase2:
     - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ]
     - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ]
     - [ "ceilometer:ha", "hacluster-ceilometer:ha" ] 
-    - [ keystone, percona-cluster ]
-    - [ nova-cloud-controller, percona-cluster ]
+    - [ keystone, mysql ]
+    - [ nova-cloud-controller, mysql ]
     - [ nova-cloud-controller, rabbitmq-server ]
     - [ nova-cloud-controller, glance ]
     - [ nova-cloud-controller, keystone ]
     - [ nova-compute, nova-cloud-controller ]
-    - [ "nova-compute:shared-db", "percona-cluster:shared-db" ]
+    - [ "nova-compute:shared-db", "mysql:shared-db" ]
     - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
     - [ nova-compute, glance ]
-    - [ glance, percona-cluster ]
+    - [ glance, mysql ]
     - [ glance, keystone ]
     - [ openstack-dashboard, keystone ]
-    - [ neutron-api, percona-cluster ]
+    - [ neutron-api, mysql ]
     - [ neutron-api, rabbitmq-server ]
     - [ neutron-api, nova-cloud-controller ]
     - [ neutron-api, keystone ]
@@ -258,7 +264,7 @@ openstack-phase2:
     - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
     - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
     - [ "ceilometer:shared-db", "mongodb:database" ]
-    - [ "heat:shared-db", "percona-cluster:shared-db" ]
+    - [ "heat:shared-db", "mysql:shared-db" ]
     - [ "heat:identity-service", "keystone:identity-service" ]
     - [ "heat:amqp", "rabbitmq-server:amqp" ]
     - [ "cinder:image-service", "glance:image-service" ]
@@ -267,13 +273,18 @@ openstack-phase2:
     - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ]
     - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ]
     - [ "ceph:client", "nova-compute:ceph" ]
-    - [ "cinder:shared-db", "percona-cluster:shared-db" ]
+    - [ "cinder:shared-db", "mysql:shared-db" ]
     - [ "ceph:client", "cinder-ceph:ceph" ]
     - [ "ceph:client", "glance:ceph" ]
     - [ "ceph-osd:mon", "ceph:osd" ]
     - [ "ceph-radosgw:mon", "ceph:radosgw" ]
     - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
-
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
 contrail:
   inherits: openstack-phase2
   services:

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index 44d4bc8..0f73df7 100644 (file)
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -153,6 +153,12 @@ openstack-phase2:
       num_units: 1
       to:
         - "lxc:nodes-api=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes-api=0"
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -192,6 +198,12 @@ openstack-phase2:
     - [ "ceph-osd:mon", "ceph:osd" ]
     - [ "ceph-radosgw:mon", "ceph:radosgw" ]
     - [ "ceph-radosgw:identity-service", "keystone:identity-service"]
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
 contrail:
   inherits: openstack-phase2
   services:

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index c792310..d69388c 100644 (file)
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -159,6 +159,12 @@ openstack-phase2:
       num_units: 1
       to:
         - "lxc:nodes-api=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        source-branch: stable/liberty
+      to:
+        - "lxc:nodes-api=0"
   relations:
     - [ keystone, mysql ]
     - [ nova-cloud-controller, mysql ]
@@ -195,6 +201,12 @@ openstack-phase2:
     - [ "cinder:shared-db", "mysql:shared-db" ]
     - [ "ceph:client", "cinder-ceph:ceph" ]
     - [ "ceph:client", "glance:ceph" ]
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
 contrail:
   inherits: openstack-phase2
   services:

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 5506209..1e82ff9 100755 (executable)
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -19,6 +19,7 @@ if [ -f ./deployconfig.yaml ];then
     EXTNET_GW=${EXTNET[2]}
     EXTNET_NET=${EXTNET[3]}
     EXTNET_PORT=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
+    ADMNET_GW=`grep "admNetgway" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
 
 fi
 
@@ -28,7 +29,7 @@ launch_eth() {
     for node in $computer_list; do
         echo "node name is ${node}"
         juju ssh $node "sudo ifconfig $EXTNET_PORT up"
-        juju ssh $node "sudo route del default gw $EXTNET_GW"
+        juju ssh $node "sudo route del default gw $ADMNET_GW"
     done
 }
 
@@ -51,7 +52,10 @@ unitMachine() {
 # create external network and subnet in openstack
 create_openrc() {
     mkdir -m 0700 -p cloud
-    keystoneIp=$(unitAddress keystone 0)
+    keystoneIp=$(juju get keystone | grep vip: -A 7 | grep value | awk '{print $2}')
+    if [ -z "$keystoneIp" ]; then
+        keystoneIp=$(unitAddress keystone 0)
+    fi
     adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}')
     configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 Canonical > cloud/admin-openrc
     chmod 0600 cloud/admin-openrc
@@ -79,12 +83,9 @@ glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3
 rm -rf /tmp/images
 
 # adjust tiny image
-nova flavor-delete m1.tiny
-nova flavor-create m1.tiny 1 512 8 1
+#nova flavor-delete m1.tiny
+#nova flavor-create m1.tiny 1 512 8 1
 
-# configure security groups
-neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default
-neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default
 
 # import key pair
 keystone tenant-create --name demo --description "Demo Tenant"
@@ -107,8 +108,12 @@ else
     neutron subnet-create ext-net --name ext-subnet \
        --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
           --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
+    # configure security groups
+    neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default
+    neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default
 fi
 
+
 # create vm network
 neutron net-create demo-net
 neutron subnet-create --name demo-subnet --gateway 10.20.5.1 demo-net 10.20.5.0/24

diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index e7f8c0d..ebd1b17 100644 (file)
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -13,6 +13,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:85:4E:2C"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:85:4E:2D"]
       power:
         type: ipmi
         address: 10.2.117.81
@@ -28,6 +31,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:84:08:B8"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:84:08:B9"]
       power:
         type: ipmi
         address: 10.2.117.82
@@ -43,6 +49,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:84:07:0D"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:84:07:0E"]
       power:
         type: ipmi
         address: 10.2.117.83
@@ -58,6 +67,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:83:FD:80"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:83:FD:81"]
       power:
         type: ipmi
         address: 10.2.117.84
@@ -73,6 +85,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:75:22:74"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:75:22:75"]
       power:
         type: ipmi
         address: 10.2.117.85

diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml
index f3ff6db..e342d43 100644 (file)
--- a/labconfig/intel/pod6/labconfig.yaml
+++ b/labconfig/intel/pod6/labconfig.yaml
@@ -13,6 +13,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:83:FD:20"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:83:FD:21"]
       power:
         type: ipmi
         address: 10.2.117.96
@@ -28,6 +31,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:75:30:F4"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:75:30:F5"]
       power:
         type: ipmi
         address: 10.2.117.97
@@ -43,6 +49,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:83:FE:74"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:83:FE:75"]
       power:
         type: ipmi
         address: 10.2.117.98
@@ -58,6 +67,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:84:15:7C"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:84:15:7D"]
       power:
         type: ipmi
         address: 10.2.117.99
@@ -73,6 +85,9 @@ lab:
       - ifname: eth4
         spaces: [data]
         mac: ["90:E2:BA:84:08:F4"]
+      - ifname: eth5
+        spaces: [public]
+        mac: ["90:E2:BA:84:08:F5"]
       power:
         type: ipmi
         address: 10.2.117.100