From 069bb3a3a90422a5771052f6f2f9fd19848ebc07 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 8 Feb 2016 13:35:10 -0600 Subject: forgot " in the last. Change-Id: I89d8a050c2ccf34fe98223749d644177e349d055 (cherry picked from commit 3b421b0613b80edce3e87944a74b21f82ba4c46f) --- ci/01-deploybundle.sh | 6 +++--- ci/odl/juju-deployer/ovs-odl-ha.yaml | 3 +-- ci/odl/juju-deployer/ovs-odl-nonha.yaml | 3 +-- ci/odl/juju-deployer/ovs-odl-tip.yaml | 3 +-- ci/onos/juju-deployer/ovs-onos-ha.yaml | 26 +++++++++++------------ ci/onos/juju-deployer/ovs-onos-nonha.yaml | 34 +++++++++++++++---------------- 6 files changed, 36 insertions(+), 39 deletions(-) diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index f8696ddc..71f2362a 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -77,13 +77,13 @@ case "$5" in sed -i -- 's/#l2-population: true/l2-population: true/g' ./bundles.yaml ;; 'sfc' ) - sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-sfc/g' ./bundles.yaml + sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-sfc"/g' ./bundles.yaml ;; 'vpn' ) - sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-vpn/g' ./bundles.yaml + sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-vpn"/g' ./bundles.yaml ;; 'odl_l3' ) - sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-l3/g' ./bundles.yaml + sed -i -- 's/profile: "openvswitch-odl-Be"/profile: "openvswitch-odl-Be-l3"/g' ./bundles.yaml ;; esac diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 2c3294a6..41325646 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -208,8 +208,7 @@ openstack-phase2: odl-controller: branch: lp:~opnfv-team/charms/trusty/odl-controller/Be options: - #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distrib - install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2 + install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz" profile: "openvswitch-odl-Be" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 0d774179..d3c1206d 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -145,8 +145,7 @@ openstack-phase2: odl-controller: branch: lp:~opnfv-team/charms/trusty/odl-controller/Be options: - #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distrib - install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2 + install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz" profile: "openvswitch-odl-Be" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index bf08438d..423a6d6d 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -146,8 +146,7 @@ openstack-phase2: odl-controller: branch: lp:~opnfv-team/charms/trusty/odl-controller/Be options: - #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distrib - install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2 + install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz" profile: "openvswitch-odl-Be" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index e25e8ab7..9c455aba 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -10,20 +10,20 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute - ntp: + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" - - "ntp:juju-info" - "nodes-compute:juju-info" -openstack-phase2: +openstack-phase2: inherits: openstack-phase1 - services: - percona-cluster: + services: + percona-cluster: branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 - options: + options: dataset-size: 2G lp1366997-workaround: true max-connections: 10000 @@ -174,10 +174,10 @@ openstack-phase2: # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" - nova-cloud-controller: + nova-cloud-controller: branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 3 - options: + options: console-access-protocol: novnc network-manager: Neutron quantum-security-groups: "yes" @@ -187,14 +187,14 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" - neutron-api: + neutron-api: branch: lp:~openstack-charmers/charms/trusty/neutron-api/next num_units: 3 options: neutron-security-groups: True manage-neutron-plugin-legacy-mode: False vip: 10.4.1.17 - to: + to: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" @@ -204,18 +204,18 @@ openstack-phase2: #ext-port: "eth1" plugin: onos instance-mtu: 1400 - to: + to: - "nodes-api=0" onos-controller: branch: "lp:~wuwenbin2/onosfw/onos-controller" options: #ext-port: "eth1" - to: + to: - "lxc:nodes-api=1" - glance: + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 - options: + options: vip: 10.4.1.12 # ha-mcastport: 5402 to: diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 7ef33fcc..6796db0a 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -10,17 +10,17 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - ntp: + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" - "nodes-api:juju-info" - - "ntp:juju-info" - "nodes-compute:juju-info" -openstack-phase2: +openstack-phase2: inherits: openstack-phase1 - services: - mysql: + services: + mysql: branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 1 options: @@ -83,21 +83,21 @@ openstack-phase2: - "lxc:nodes-api=0" cinder-ceph: branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next" - rabbitmq-server: + rabbitmq-server: branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next" num_units: 1 to: - "lxc:nodes-api=0" - keystone: + keystone: branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 1 - options: + options: # ha-mcastport: 5402 admin-password: openstack admin-token: admin to: - "lxc:nodes-api=0" - openstack-dashboard: + openstack-dashboard: branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 1 options: @@ -105,10 +105,10 @@ openstack-phase2: webroot: / to: - "lxc:nodes-api=0" - nova-compute: + nova-compute: branch: lp:~openstack-charmers/charms/trusty/nova-compute/next num_units: 1 - options: + options: enable-live-migration: False manage-neutron-plugin-legacy-mode: False to: @@ -117,22 +117,22 @@ openstack-phase2: # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" - nova-cloud-controller: + nova-cloud-controller: branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next" num_units: 1 - options: + options: console-access-protocol: novnc network-manager: Neutron quantum-security-groups: "yes" to: - "lxc:nodes-api=0" - neutron-api: + neutron-api: branch: lp:~openstack-charmers/charms/trusty/neutron-api/next num_units: 1 options: neutron-security-groups: True manage-neutron-plugin-legacy-mode: False - to: + to: - "lxc:nodes-api=0" neutron-gateway: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next @@ -140,15 +140,15 @@ openstack-phase2: #ext-port: "eth1" plugin: onos instance-mtu: 1400 - to: + to: - "nodes-api=0" onos-controller: branch: "lp:~wuwenbin2/onosfw/onos-controller" options: #ext-port: "eth1" - to: + to: - "lxc:nodes-api=0" - glance: + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 to: -- cgit 1.2.3-korg