diff options
| -rwxr-xr-x | ci/01-deploybundle.sh | 13 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 8 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 2 |
4 files changed, 12 insertions, 13 deletions
diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 5f64119f..3a6c10f4 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -1,26 +1,25 @@ #!/bin/bash -#!/bin/bash #placeholder for deployment script. set -ex case "$1" in 'nonha' ) - cp opencontrail/juju-deployer/contrail.yaml ./bundles.yaml + cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml ;; 'ha' ) - cp opencontrail/juju-deployer/contrail-ha.yaml ./bundles.yaml + cp odl/juju-deployer/ovs-odl-ha.yaml ./bundles.yaml ;; 'tip' ) - cp opencontrail/juju-deployer/contrail-tip.yaml ./bundles.yaml + cp odl/juju-deployer/ovs-odl-tip.yaml ./bundles.yaml ;; * ) - cp opencontrail/juju-deployer/contrail.yaml ./bundles.yaml + cp odl/juju-deployer/ovs-odl.yaml ./bundles.yaml ;; esac echo "... Deployment Started ...." -echo juju-deployer -d -r 13 -c bundles.yaml trusty-"$2"-contrail +#case openstack kilo with odl +juju-deployer -d -r 13 -c bundles.yaml trusty-"$2" echo "... Deployment finished ...." - diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 8da98659..6373f2d0 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -35,7 +35,7 @@ openstack-services: install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" to: lxc:ubuntu=0 openvswitch-odl: - charm: local:trusty/openvswitch-odl + branch: lp:~alai/charms/trusty/openvswitch-odl/trunk mysql: charm: cs:trusty/mysql options: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index f2833635..3c490d71 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -34,7 +34,7 @@ openstack-services: install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" to: lxc:ubuntu=0 openvswitch-odl: - charm: local:trusty/openvswitch-odl + branch: lp:~alai/charms/trusty/openvswitch-odl/trunk mysql: charm: cs:trusty/mysql options: @@ -88,7 +88,7 @@ openstack-services: - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] - ['openstack-dashboard:identity-service','keystone:identity-service'] # master -openstack-master-git: +trusty-master: inherits: openstack-services services: keystone: @@ -118,8 +118,8 @@ openstack-master-git: nova-cloud-controller: options: openstack-origin-git: include-file://nova-master.yaml -trusty-master-kilo: - inherits: openstack-master-git +trusty-kilo: + inherits: trusty-master series: trusty overrides: openstack-origin: cloud:trusty-kilo diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 8da98659..6373f2d0 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -35,7 +35,7 @@ openstack-services: install-url: "http://10.4.1.1/odl/distribution-karaf-0.2.4-Helium-SR4.tar.gz" to: lxc:ubuntu=0 openvswitch-odl: - charm: local:trusty/openvswitch-odl + branch: lp:~alai/charms/trusty/openvswitch-odl/trunk mysql: charm: cs:trusty/mysql options: |