summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-12-19 10:50:10 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-12-19 10:50:10 -0600
commit095dc54cfa61572518b1cbcb5a392467883bdcc0 (patch)
tree91c84275886673ba677ced006bfd833b08cd1763 /ci
parent4aa9b505a8c9001a9b8af6d9199422254e148842 (diff)
modified the bundle for no SDN feature and releasing it for
production version only. Change-Id: If8253fdca06de1bdfaa8faa51e52e4f489460828
Diffstat (limited to 'ci')
-rwxr-xr-xci/nosdn/01-deploybundle.sh4
-rw-r--r--ci/nosdn/juju-deployer/ovs.yaml333
-rwxr-xr-xci/nosdn/juju-deployer/scripts/openstack.sh5
3 files changed, 171 insertions, 171 deletions
diff --git a/ci/nosdn/01-deploybundle.sh b/ci/nosdn/01-deploybundle.sh
index 8dc47efa..a25df2e1 100755
--- a/ci/nosdn/01-deploybundle.sh
+++ b/ci/nosdn/01-deploybundle.sh
@@ -36,7 +36,7 @@ case "$3" in
# As environment does not need special treatment for interfaces for MAAS 1.9
sed -i -- 's/local:trusty\/ubuntu-nodes-controller/cs:trusty\/ubuntu/g' ./bundles.yaml
sed -i -- 's/local:trusty\/ubuntu-nodes-compute/cs:trusty\/ubuntu/g' ./bundles.yaml
- # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
+ # As per your lab vip address list be deafult uses 10.4.1.21 - 10.4.1.29
sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
# 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
@@ -48,7 +48,7 @@ case "$3" in
cp maas/intel/pod5/lxc-add-more-interfaces trusty/ubuntu-nodes-controller/lxc/add-more-interfaces
cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-compute/network/interfaces.host
cp maas/intel/pod5/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
+ # As per your lab vip address list be deafult uses 10.4.1.21 - 10.4.1.29
sed -i -- 's/10.4.1.1/10.4.1.2/g' ./bundles.yaml
# 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
diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
index 01f3704b..1d4560a6 100644
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@ -19,222 +19,229 @@ openstack-phase1:
- "nodes-compute:juju-info"
openstack-phase2:
inherits: openstack-phase1
- services:
- "mysql":
- charm: "cs:trusty/mysql"
- num_units: 1
- options:
- "dataset-size": 2G
- "max-connections": 10000
- to:
- - "lxc:nodes-api=0"
- "ceilometer":
- branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
- num_units: 1
- to:
- - "lxc:nodes-api=0"
- "ceilometer-agent":
- branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
- "mongodb":
- charm: "cs:trusty/mongodb"
+ services:
+ ceilometer:
+ charm: cs:trusty/ceilometer
num_units: 1
to:
- "lxc:nodes-api=0"
- heat:
- branch: "lp:~openstack-charmers/charms/trusty/heat/next"
- to:
- - "lxc:nodes-api=0"
+ ceilometer-agent:
+ charm: cs:trusty/ceilometer-agent
ceph:
charm: cs:trusty/ceph
num_units: 1
options:
+ monitor-count: 1
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
osd-devices: /srv
- monitor-count: 1
- osd-reformat: 'no'
+ osd-reformat: 'yes'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /srv
-# osd-reformat: 'yes'
-# to:
-# - "nodes-compute=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ ceph-osd:
+ charm: cs:trusty/ceph-osd
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
+ to:
+ - "nodes-api=0"
+ ceph-radosgw:
+ charm: cs:trusty/ceph-radosgw
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
charm: cs:trusty/cinder
num_units: 1
options:
block-device: None
glance-api-version: 2
-# ha-mcastport: 5401
+ ha-mcastport: 5401
to:
- "lxc:nodes-api=0"
cinder-ceph:
charm: cs:trusty/cinder-ceph
- "rabbitmq-server":
- branch: lp:charms/trusty/rabbitmq-server
+ num_units: 0
+ glance:
+ charm: cs:trusty/glance
num_units: 1
+ options:
+ ha-mcastport: 5402
to:
- "lxc:nodes-api=0"
- "keystone":
- branch: lp:charms/trusty/keystone
+ keystone:
+ charm: cs:trusty/keystone
num_units: 1
- options:
-# ha-mcastport: 5402
- "admin-password": openstack
- "admin-token": admin
+ options:
+ admin-password: openstack
+ admin-token: admin
+ ha-mcastport: 5403
to:
- "lxc:nodes-api=0"
- "openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ mongodb:
+ charm: cs:trusty/mongodb
num_units: 1
- options:
- secret: admin
- webroot: /
to:
- "lxc:nodes-api=0"
- "nova-compute":
- branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+ mysql:
+ charm: cs:trusty/percona-cluster
num_units: 1
- options:
- "enable-live-migration": False
- "manage-neutron-plugin-legacy-mode": False
+ options:
+ max-connections: 20000
+ to:
+ - "lxc:nodes-api=0"
+ neutron-api:
+ charm: cs:trusty/neutron-api
+ num_units: 1
+ options:
+ neutron-security-groups: true
+ to:
+ - "lxc:nodes-api=0"
+ neutron-gateway:
+ charm: cs:trusty/neutron-gateway
+ num_units: 1
+ options:
+# "ext-port": "eth1"
+ to:
+ - "nodes-api=0"
+ neutron-openvswitch:
+ charm: cs:trusty/neutron-openvswitch
+ num_units: 0
+ nova-cloud-controller:
+ charm: cs:trusty/nova-cloud-controller
+ num_units: 1
+ options:
+ network-manager: Neutron
+ quantum-security-groups: 'yes'
+ to:
+ - "lxc:nodes-api=0"
+ nova-compute:
+ charm: cs:trusty/nova-compute
+ num_units: 1
+ options:
+ enable-live-migration: true
+ enable-resize: true
+ manage-neutron-plugin-legacy-mode: false
+ migration-auth-type: ssh
to:
- "nodes-compute=0"
# - "nodes-compute=1"
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
- "nova-cloud-controller":
- branch: lp:charms/trusty/nova-cloud-controller
+ openstack-dashboard:
+ charm: cs:trusty/openstack-dashboard
num_units: 1
- options:
- "console-access-protocol": novnc
- "network-manager": Neutron
- "quantum-security-groups": "yes"
+ options:
+ secret: admin
+ webroot: /
to:
- "lxc:nodes-api=0"
- "neutron-api":
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ rabbitmq-server:
+ charm: cs:trusty/rabbitmq-server
num_units: 1
- options:
- neutron-security-groups: True
- manage-neutron-plugin-legacy-mode: False
- to:
+ to:
- "lxc:nodes-api=0"
- neutron-gateway:
- branch: lp:charms/trusty/neutron-gateway
- options:
-# "ext-port": "eth1"
- to:
- - "nodes-api=0"
- "glance":
- branch: lp:charms/trusty/glance
- num_units: 1
+ heat:
+ charm: cs:trusty/heat
to:
- "lxc:nodes-api=0"
- neutron-openvswitch:
- branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next
relations:
+ - - nova-compute:amqp
+ - rabbitmq-server:amqp
+ - - neutron-gateway:amqp
+ - rabbitmq-server:amqp
+ - - keystone:shared-db
+ - mysql:shared-db
+ - - nova-cloud-controller:identity-service
+ - keystone:identity-service
+ - - glance:identity-service
+ - keystone:identity-service
+ - - neutron-api:identity-service
+ - keystone:identity-service
- - neutron-openvswitch:neutron-plugin-api
- neutron-api:neutron-plugin-api
+ - - neutron-api:shared-db
+ - mysql:shared-db
+ - - neutron-api:amqp
+ - rabbitmq-server:amqp
+ - - neutron-gateway:neutron-plugin-api
+ - neutron-api:neutron-plugin-api
+ - - glance:shared-db
+ - mysql:shared-db
+ - - 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
- - nova-compute:neutron-plugin
- neutron-openvswitch:neutron-plugin
- - neutron-openvswitch:amqp
- rabbitmq-server:amqp
- - - "keystone:shared-db"
- - "mysql:shared-db"
- - - "nova-cloud-controller:shared-db"
- - "mysql: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"
- - "mysql:shared-db"
- - - "glance:identity-service"
- - "keystone:identity-service"
- - - "glance:amqp"
- - "rabbitmq-server:amqp"
- - - "openstack-dashboard:identity-service"
- - "keystone:identity-service"
- - - "neutron-api:shared-db"
- - "mysql: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"
- - - "ceilometer:amqp"
- - "rabbitmq-server:amqp"
- - - "ceilometer-agent:ceilometer-service"
- - "ceilometer:ceilometer-service"
- - - "ceilometer:identity-service"
- - "keystone:identity-service"
- - - "ceilometer:identity-notifications"
- - "keystone:identity-notifications"
- - - "ceilometer-agent:nova-ceilometer"
- - "nova-compute:nova-ceilometer"
- - - "ceilometer:shared-db"
- - "mongodb:database"
- - - "heat:shared-db"
- - "mysql:shared-db"
- - - "heat:identity-service"
- - "keystone:identity-service"
- - - "heat:amqp"
- - "rabbitmq-server:amqp"
- - - "cinder:image-service"
- - "glance:image-service"
- - - "cinder:amqp"
- - "rabbitmq-server:amqp"
- - - "cinder:identity-service"
- - "keystone:identity-service"
- - - "cinder:cinder-volume-service"
- - "nova-cloud-controller:cinder-volume-service"
- - - "cinder-ceph:storage-backend"
- - "cinder:storage-backend"
- - - "ceph:client"
- - "nova-compute:ceph"
- - - "cinder:shared-db"
- - "mysql:shared-db"
- - - "ceph:client"
- - "cinder-ceph:ceph"
- - - "ceph:client"
- - "glance:ceph"
-# - - ceph-osd:mon
-# - ceph:osd
-# - - ceph-radosgw:mon
-# - ceph:radosgw
-# - - ceph-radosgw:identity-service
-# - keystone:identity-service
+ - - openstack-dashboard:identity-service
+ - keystone:identity-service
+ - - nova-cloud-controller:shared-db
+ - mysql:shared-db
+ - - nova-cloud-controller:neutron-api
+ - neutron-api:neutron-api
+ - - cinder:image-service
+ - glance:image-service
+ - - cinder:amqp
+ - rabbitmq-server:amqp
+ - - cinder:identity-service
+ - keystone:identity-service
+ - - cinder:cinder-volume-service
+ - nova-cloud-controller:cinder-volume-service
+ - - cinder-ceph:storage-backend
+ - cinder:storage-backend
+ - - ceph:client
+ - nova-compute:ceph
+ - - cinder:shared-db
+ - mysql:shared-db
+ - - ceph:client
+ - cinder-ceph:ceph
+ - - ceph:client
+ - glance:ceph
+ - - ceph-osd:mon
+ - ceph:osd
+ - - ntp:juju-info
+ - nova-compute:juju-info
+ - - ntp:juju-info
+ - neutron-gateway:juju-info
+ - - ceph-radosgw:mon
+ - ceph:radosgw
+ - - ceph-radosgw:identity-service
+ - keystone:identity-service
+ - - ceilometer:amqp
+ - rabbitmq-server:amqp
+ - - ceilometer-agent:ceilometer-service
+ - ceilometer:ceilometer-service
+ - - ceilometer:identity-service
+ - keystone:identity-service
+ - - ceilometer:identity-notifications
+ - keystone:identity-notifications
+ - - ceilometer-agent:nova-ceilometer
+ - nova-compute:nova-ceilometer
+ - - ceilometer:shared-db
+ - mongodb:database
+ - - heat:shared-db
+ - mysql:shared-db
+ - - heat:identity-service
+ - keystone:identity-service
+ - - heat:amqp
+ - rabbitmq-server:amqp
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@ -267,7 +274,6 @@ trusty-kilo:
series: trusty
ceph-osd-replication-count: 1
-
trusty-juno-nodes:
inherits: openstack-phase1
overrides:
@@ -284,4 +290,3 @@ trusty-juno:
series: trusty
ceph-osd-replication-count: 1
-
diff --git a/ci/nosdn/juju-deployer/scripts/openstack.sh b/ci/nosdn/juju-deployer/scripts/openstack.sh
index 77f97723..562df8e9 100755
--- a/ci/nosdn/juju-deployer/scripts/openstack.sh
+++ b/ci/nosdn/juju-deployer/scripts/openstack.sh
@@ -21,13 +21,8 @@ unitMachine()
juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
}
-<<<<<<< HEAD
-juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
-juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
-=======
#juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
#juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
->>>>>>> 69227d1... modified the bundle to include the ceph and cinder changes.
mkdir -m 0700 -p cloud
controller_address=$(unitAddress keystone 0)