summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-12-04 13:11:44 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-12-04 19:38:59 -0600
commit6c7fc201c56648de9622dffc48a3f47e81de9465 (patch)
treed2c9218d0da1a2f05a6058f1b0c0b83e89c49b84 /ci/opencontrail
parentb4ee809c40d27d3323bb19b4edfd188ebd0535d6 (diff)
modified to comment the use of juju-br0 as external network.
Added option to install neutron-openswitch without ODL. consolidated source files to common as all sdn share the s same source for openstack and it can be modified during deployment. Change-Id: I1df7f5cd5d928d170bc6be6b32c3404dbcb5fda3
Diffstat (limited to 'ci/opencontrail')
-rwxr-xr-xci/opencontrail/01-deploybundle.sh7
-rw-r--r--ci/opencontrail/juju-deployer/source/cinder-master.yaml10
-rw-r--r--ci/opencontrail/juju-deployer/source/glance-master.yaml10
-rw-r--r--ci/opencontrail/juju-deployer/source/horizon-master.yaml10
-rw-r--r--ci/opencontrail/juju-deployer/source/keystone-master.yaml10
-rw-r--r--ci/opencontrail/juju-deployer/source/neutron-master.yaml19
-rw-r--r--ci/opencontrail/juju-deployer/source/nova-master.yaml13
7 files changed, 3 insertions, 76 deletions
diff --git a/ci/opencontrail/01-deploybundle.sh b/ci/opencontrail/01-deploybundle.sh
index f9268b69..90f43a9a 100755
--- a/ci/opencontrail/01-deploybundle.sh
+++ b/ci/opencontrail/01-deploybundle.sh
@@ -11,7 +11,7 @@ case "$1" in
;;
'tip' )
cp opencontrail/juju-deployer/contrail-tip.yaml ./bundles.yaml
- cp opencontrail/juju-deployer/source/* ./
+ cp common/source/* ./
sed -i -- "s|branch: master|branch: stable/$2|g" ./*.yaml
;;
* )
@@ -62,9 +62,9 @@ case "$3" in
cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
cp maas/att/virpod1/lxc-add-more-interfaces trusty/ubuntu-nodes-compute/lxc/add-more-interfaces
# As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
- sed -i -- 's/10.4.1.1/192.168.1.1/g' ./bundles.yaml
+ sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "juju-br0"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml
;;
esac
@@ -88,4 +88,3 @@ case "$1" in
;;
esac
-echo "... Deployment finished ...."
diff --git a/ci/opencontrail/juju-deployer/source/cinder-master.yaml b/ci/opencontrail/juju-deployer/source/cinder-master.yaml
deleted file mode 100644
index b000d709..00000000
--- a/ci/opencontrail/juju-deployer/source/cinder-master.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-repositories:
- - {name: requirements,
- repository: 'git://github.com/openstack/requirements',
- branch: master}
- - {name: cinder,
- repository: 'git://github.com/openstack/cinder',
- branch: master}
-directory: /mnt/openstack-git
-#http_proxy: http://squid.internal:3128
-#https_proxy: http://squid.internal:3128
diff --git a/ci/opencontrail/juju-deployer/source/glance-master.yaml b/ci/opencontrail/juju-deployer/source/glance-master.yaml
deleted file mode 100644
index 94a0622b..00000000
--- a/ci/opencontrail/juju-deployer/source/glance-master.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-repositories:
- - {name: requirements,
- repository: 'git://github.com/openstack/requirements',
- branch: master}
- - {name: glance,
- repository: 'git://github.com/openstack/glance',
- branch: master}
-directory: /mnt/openstack-git
-#http_proxy: http://squid.internal:3128
-#https_proxy: http://squid.internal:3128
diff --git a/ci/opencontrail/juju-deployer/source/horizon-master.yaml b/ci/opencontrail/juju-deployer/source/horizon-master.yaml
deleted file mode 100644
index 0fd7e501..00000000
--- a/ci/opencontrail/juju-deployer/source/horizon-master.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-repositories:
- - {name: requirements,
- repository: 'git://github.com/openstack/requirements',
- branch: master}
- - {name: horizon,
- repository: 'git://github.com/openstack/horizon',
- branch: master}
-directory: /mnt/openstack-git
-#http_proxy: http://squid.internal:3128
-#https_proxy: http://squid.internal:3128
diff --git a/ci/opencontrail/juju-deployer/source/keystone-master.yaml b/ci/opencontrail/juju-deployer/source/keystone-master.yaml
deleted file mode 100644
index fb8575de..00000000
--- a/ci/opencontrail/juju-deployer/source/keystone-master.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-repositories:
- - {name: requirements,
- repository: 'git://github.com/openstack/requirements',
- branch: master}
- - {name: keystone,
- repository: 'git://github.com/openstack/keystone',
- branch: master}
-directory: /mnt/openstack-git
-#http_proxy: http://squid.internal:3128
-#https_proxy: http://squid.internal:3128
diff --git a/ci/opencontrail/juju-deployer/source/neutron-master.yaml b/ci/opencontrail/juju-deployer/source/neutron-master.yaml
deleted file mode 100644
index ee4c8932..00000000
--- a/ci/opencontrail/juju-deployer/source/neutron-master.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-repositories:
- - {name: requirements,
- repository: 'git://github.com/openstack/requirements',
- branch: master}
- - {name: neutron-fwaas,
- repository: 'git://github.com/openstack/neutron-fwaas',
- branch: master}
- - {name: neutron-lbaas,
- repository: 'git://github.com/openstack/neutron-lbaas',
- branch: master}
- - {name: neutron-vpnaas,
- repository: 'git://github.com/openstack/neutron-vpnaas',
- branch: master}
- - {name: neutron,
- repository: 'git://github.com/openstack/neutron',
- branch: master}
-directory: /mnt/openstack-git
-#http_proxy: http://squid.internal:3128
-#https_proxy: http://squid.internal:3128
diff --git a/ci/opencontrail/juju-deployer/source/nova-master.yaml b/ci/opencontrail/juju-deployer/source/nova-master.yaml
deleted file mode 100644
index 0bbee4c3..00000000
--- a/ci/opencontrail/juju-deployer/source/nova-master.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-repositories:
- - {name: requirements,
- repository: 'git://github.com/openstack/requirements',
- branch: master}
- - {name: neutron,
- repository: 'git://github.com/openstack/neutron',
- branch: master}
- - {name: nova,
- repository: 'git://github.com/openstack/nova',
- branch: master}
-directory: /mnt/openstack-git
-#http_proxy: http://squid.internal:3128
-#https_proxy: http://squid.internal:3128