From 6c7fc201c56648de9622dffc48a3f47e81de9465 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 4 Dec 2015 13:11:44 -0600 Subject: 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 --- ci/odl/juju-deployer/source/cinder-master.yaml | 10 ---------- ci/odl/juju-deployer/source/glance-master.yaml | 10 ---------- ci/odl/juju-deployer/source/horizon-master.yaml | 10 ---------- ci/odl/juju-deployer/source/keystone-master.yaml | 10 ---------- ci/odl/juju-deployer/source/neutron-master.yaml | 19 ------------------- ci/odl/juju-deployer/source/nova-master.yaml | 13 ------------- 6 files changed, 72 deletions(-) delete mode 100644 ci/odl/juju-deployer/source/cinder-master.yaml delete mode 100644 ci/odl/juju-deployer/source/glance-master.yaml delete mode 100644 ci/odl/juju-deployer/source/horizon-master.yaml delete mode 100644 ci/odl/juju-deployer/source/keystone-master.yaml delete mode 100644 ci/odl/juju-deployer/source/neutron-master.yaml delete mode 100644 ci/odl/juju-deployer/source/nova-master.yaml (limited to 'ci/odl/juju-deployer') diff --git a/ci/odl/juju-deployer/source/cinder-master.yaml b/ci/odl/juju-deployer/source/cinder-master.yaml deleted file mode 100644 index b000d709..00000000 --- a/ci/odl/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/odl/juju-deployer/source/glance-master.yaml b/ci/odl/juju-deployer/source/glance-master.yaml deleted file mode 100644 index 94a0622b..00000000 --- a/ci/odl/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/odl/juju-deployer/source/horizon-master.yaml b/ci/odl/juju-deployer/source/horizon-master.yaml deleted file mode 100644 index 0fd7e501..00000000 --- a/ci/odl/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/odl/juju-deployer/source/keystone-master.yaml b/ci/odl/juju-deployer/source/keystone-master.yaml deleted file mode 100644 index fb8575de..00000000 --- a/ci/odl/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/odl/juju-deployer/source/neutron-master.yaml b/ci/odl/juju-deployer/source/neutron-master.yaml deleted file mode 100644 index ee4c8932..00000000 --- a/ci/odl/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/odl/juju-deployer/source/nova-master.yaml b/ci/odl/juju-deployer/source/nova-master.yaml deleted file mode 100644 index 0bbee4c3..00000000 --- a/ci/odl/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 -- cgit 1.2.3-korg