summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/odl/01-deploybundle.sh6
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml112
2 files changed, 57 insertions, 61 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 36057dec..f9fb5f06 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -28,7 +28,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# "ext-port": "eth1"/# "ext-port": "brPublic"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml
;;
'intelpod6' )
cp maas/intel/pod6/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
@@ -40,7 +40,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# "ext-port": "eth1"/# "ext-port": "brPublic"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml
;;
'intelpod5' )
cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
@@ -52,7 +52,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# "ext-port": "eth1"/# "ext-port": "brPublic"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/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 27a10d6f..740cb16a 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -60,16 +60,14 @@ openstack-phase2:
corosync_key: |
'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
"rabbitmq-server":
- charm: "cs:trusty/rabbitmq-server"
+ branch: lp:charms/trusty/rabbitmq-server
num_units: 3
- options:
- management_plugin: true
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
"keystone":
- charm: "cs:trusty/keystone"
+ branch: lp:charms/trusty/keystone
num_units: 3
options:
"admin-password": openstack
@@ -80,7 +78,7 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
"openstack-dashboard":
- charm: "cs:trusty/openstack-dashboard"
+ branch: lp:charms/trusty/openstack-dashboard
num_units: 3
options:
secret: admin
@@ -91,12 +89,11 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
"nova-compute":
- branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
+ branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 4
options:
- "enable-live-migration": true
- "enable-resize": true
- "migration-auth-type": ssh
+ "enable-live-migration": False
+ "manage-neutron-plugin-legacy-mode": False
to:
- "nodes-compute=0"
# - "nodes-compute=1"
@@ -104,7 +101,7 @@ openstack-phase2:
- "nodes-api=1"
- "nodes-api=2"
"nova-cloud-controller":
- charm: "cs:trusty/nova-cloud-controller"
+ branch: lp:charms/trusty/nova-cloud-controller
num_units: 3
options:
"console-access-protocol": novnc
@@ -120,7 +117,7 @@ openstack-phase2:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 3
options:
- neutron-security-groups: False
+ neutron-security-groups: True
manage-neutron-plugin-legacy-mode: False
vip: 10.4.1.17
to:
@@ -128,24 +125,25 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-gateway:
- branch: lp:~narindergupta/charms/trusty/neutron-gateway/ovs-odl
-# num_units: 3
-# constraints: tags=gateway
+ branch: lp:charms/trusty/neutron-gateway
options:
# "ext-port": "eth1"
plugin: ovs-odl
-# instance-mtu: 1400
+ instance-mtu: 1400
to:
- "nodes-api=0"
odl-controller:
- branch: lp:~narindergupta/charms/trusty/odl-controller/liberty
+ branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
options:
install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+ http-proxy: "http://squid.internal:3128"
+ https-proxy: "http://squid.internal:3128"
+
to:
- "lxc:nodes-api=1"
"glance":
- charm: "cs:trusty/glance"
+ branch: lp:charms/trusty/glance
num_units: 3
options:
vip: 10.4.1.12
@@ -154,7 +152,7 @@ openstack-phase2:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-api-odl:
- branch: lp:~narindergupta/charms/trusty/neutron-api-odl/liberty
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
options:
overlay-network-type: 'vxlan gre'
security-groups: true
@@ -171,46 +169,6 @@ openstack-phase2:
- "hacluster-nova:ha"
- - "openstack-dashboard:ha"
- "hacluster-horizon:ha"
- - - "nova-compute:amqp"
- - "rabbitmq-server:amqp"
- - - "neutron-gateway:amqp"
- - "rabbitmq-server:amqp"
- - - "nova-cloud-controller:identity-service"
- - "keystone:identity-service"
- - - "glance:identity-service"
- - "keystone:identity-service"
- - - "neutron-api:identity-service"
- - "keystone:identity-service"
- - - "neutron-api:amqp"
- - "rabbitmq-server:amqp"
- - - "neutron-gateway:neutron-plugin-api"
- - "neutron-api:neutron-plugin-api"
- - - "glance:amqp"
- - "rabbitmq-server:amqp"
- - - "nova-cloud-controller:image-service"
- - "glance:image-service"
- - - "nova-compute:image-service"
- - "glance:image-service"
- - - "nova-cloud-controller:cloud-compute"
- - "nova-compute:cloud-compute"
- - - "nova-cloud-controller:amqp"
- - "rabbitmq-server:amqp"
- - - "nova-cloud-controller:quantum-network-service"
- - "neutron-gateway:quantum-network-service"
- - - "openstack-dashboard:identity-service"
- - "keystone:identity-service"
- - - "nova-cloud-controller:neutron-api"
- - "neutron-api:neutron-api"
- - - "neutron-gateway:shared-db"
- - "percona-cluster:shared-db"
- - - "glance:shared-db"
- - "percona-cluster:shared-db"
- - - "keystone:shared-db"
- - "percona-cluster:shared-db"
- - - "nova-cloud-controller:shared-db"
- - "percona-cluster:shared-db"
- - - "neutron-api:shared-db"
- - "percona-cluster:shared-db"
- - "neutron-api:neutron-plugin-api-subordinate"
- "neutron-api-odl:neutron-plugin-api-subordinate"
- - "nova-compute:neutron-plugin"
@@ -221,6 +179,44 @@ openstack-phase2:
- "odl-controller:ovsdb-manager"
- - "neutron-api-odl:odl-controller"
- "odl-controller:controller-api"
+ - - "keystone:shared-db"
+ - "percona-cluster:shared-db"
+ - - "nova-cloud-controller:shared-db"
+ - "percona-cluster:shared-db"
+ - - "nova-cloud-controller:amqp"
+ - "rabbitmq-server:amqp"
+ - - "nova-cloud-controller:image-service"
+ - "glance:image-service"
+ - - "nova-cloud-controller:identity-service"
+ - "keystone:identity-service"
+ - - "nova-cloud-controller:cloud-compute"
+ - "nova-compute:cloud-compute"
+ - - "nova-compute:amqp"
+ - "rabbitmq-server:amqp"
+ - - "nova-compute:image-service"
+ - "glance:image-service"
+ - - "glance:shared-db"
+ - "percona-cluster:shared-db"
+ - - "glance:identity-service"
+ - "keystone:identity-service"
+ - - "glance:amqp"
+ - "rabbitmq-server:amqp"
+ - - "openstack-dashboard:identity-service"
+ - "keystone:identity-service"
+ - - "neutron-api:shared-db"
+ - "percona-cluster:shared-db"
+ - - "neutron-api:amqp"
+ - "rabbitmq-server:amqp"
+ - - "nova-cloud-controller:neutron-api"
+ - "neutron-api:neutron-api"
+ - - "neutron-api:identity-service"
+ - "keystone:identity-service"
+ - - "neutron-gateway:amqp"
+ - "rabbitmq-server:amqp"
+ - - "neutron-gateway:neutron-plugin-api"
+ - "neutron-api:neutron-plugin-api"
+ - - "nova-cloud-controller:quantum-network-service"
+ - "neutron-gateway:quantum-network-service"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides: