summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml112
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml71
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml64
3 files changed, 97 insertions, 150 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 91c55ea3..6ff220c5 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -2,31 +2,24 @@
openstack-phase1:
series: trusty
services:
- nodes-api:
+ nodes:
charm: "cs:trusty/ubuntu"
- num_units: 3
- constraints: tags=control
- nodes-compute:
- charm: "cs:trusty/ubuntu"
- num_units: 2
- constraints: tags=compute
- ntp:
+ num_units: 5
+ ntp:
charm: "local:trusty/ntp"
relations:
- - "ntp:juju-info"
- - "nodes-api:juju-info"
- - - "ntp:juju-info"
- - "nodes-compute:juju-info"
-openstack-phase2:
+ - "nodes:juju-info"
+openstack-phase2:
inherits: openstack-phase1
services:
ceilometer:
charm: "local:trusty/ceilometer"
num_units: 3
to:
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
+ - "lxc:nodes=0"
+ - "lxc:nodes=1"
+ - "lxc:nodes=2"
ceilometer-agent:
charm: "local:trusty/ceilometer-agent"
ceph:
@@ -41,26 +34,26 @@ openstack-phase2:
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "lxc:nodes-api=2"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
+ - "lxc:nodes=1"
+ - "lxc:nodes=2"
+ - "lxc:nodes=3"
ceph-osd:
charm: "local:trusty/ceph-osd"
- num_units: 2
+ num_units: 3
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "nodes=2"
+ - "nodes=3"
+ - "nodes=4"
ceph-radosgw:
charm: "local:trusty/ceph-radosgw"
- num_units: 1
options:
use-embedded-webserver: true
operator-roles: "Member,admin"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
cinder:
charm: "local:trusty/cinder"
num_units: 3
@@ -69,12 +62,11 @@ openstack-phase2:
glance-api-version: 2
ha-mcastport: 5401
to:
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=2"
+ - "lxc:nodes=2"
+ - "lxc:nodes=3"
+ - "lxc:nodes=4"
cinder-ceph:
charm: "local:trusty/cinder-ceph"
- num_units: 0
glance:
charm: "local:trusty/glance"
num_units: 3
@@ -82,13 +74,13 @@ openstack-phase2:
ha-mcastport: 5402
vip: 10.4.1.12
to:
- - "lxc:nodes-api=2"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
+ - "lxc:nodes=3"
+ - "lxc:nodes=4"
+ - "lxc:nodes=0"
opnfv-promise:
charm: local:trusty/promise
to:
- - "lxc:nodes-api=2"
+ - "lxc:nodes=0"
keystone:
charm: "local:trusty/keystone"
num_units: 3
@@ -98,14 +90,13 @@ openstack-phase2:
ha-mcastport: 5403
vip: 10.4.1.13
to:
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
+ - "lxc:nodes=4"
+ - "lxc:nodes=0"
+ - "lxc:nodes=1"
mongodb:
charm: local:trusty/mongodb
- num_units: 1
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
mysql:
charm: "local:trusty/percona-cluster"
num_units: 3
@@ -116,9 +107,9 @@ openstack-phase2:
sst-password: 127rc14t51
vip: 10.4.1.15
to:
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=2"
+ - "lxc:nodes=0"
+ - "lxc:nodes=1"
+ - "lxc:nodes=2"
neutron-api:
charm: "local:trusty/neutron-api"
num_units: 3
@@ -127,20 +118,18 @@ openstack-phase2:
flat-network-providers: "*"
vip: 10.4.1.17
to:
- - "lxc:nodes-api=2"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
+ - "lxc:nodes=1"
+ - "lxc:nodes=2"
+ - "lxc:nodes=3"
neutron-gateway:
charm: "local:trusty/neutron-gateway"
- num_units: 1
options:
#ext-port: "eth1"
instance-mtu: 1400
to:
- - "nodes-api=0"
+ - "nodes=0"
neutron-openvswitch:
charm: "local:trusty/neutron-openvswitch"
- num_units: 0
nova-cloud-controller:
charm: "local:trusty/nova-cloud-controller"
num_units: 3
@@ -149,23 +138,22 @@ openstack-phase2:
service-guard: true
vip: 10.4.1.16
to:
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
+ - "lxc:nodes=2"
+ - "lxc:nodes=3"
+ - "lxc:nodes=4"
nova-compute:
charm: "local:trusty/nova-compute"
- num_units: 2
+ num_units: 4
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"
+ - "nodes=1"
+ - "nodes=2"
+ - "nodes=3"
+ - "nodes=4"
openstack-dashboard:
charm: "local:trusty/openstack-dashboard"
num_units: 3
@@ -174,20 +162,20 @@ openstack-phase2:
webroot: /
vip: 10.4.1.11
to:
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=2"
+ - "lxc:nodes=3"
+ - "lxc:nodes=4"
+ - "lxc:nodes=0"
rabbitmq-server:
charm: "local:trusty/rabbitmq-server"
num_units: 3
to:
- - "lxc:nodes-api=2"
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
+ - "lxc:nodes=4"
+ - "lxc:nodes=0"
+ - "lxc:nodes=1"
heat:
charm: "local:trusty/heat"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
hacluster-keystone:
charm: "local:trusty/hacluster"
options:
@@ -333,6 +321,6 @@ trusty-mitaka:
#source: "cloud:trusty-mitaka"
openstack-origin: "cloud:trusty-mitaka"
series: trusty
- ceph-osd-replication-count: 2
+ #ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index f473561f..647a1019 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -2,29 +2,21 @@
openstack-phase1:
series: trusty
services:
- nodes-api:
- charm: "cs:trusty/ubuntu"
- num_units: 1
- constraints: tags=control
- nodes-compute:
+ nodes:
charm: "cs:trusty/ubuntu"
num_units: 2
- constraints: tags=compute
- ntp:
+ ntp:
charm: "local:trusty/ntp"
relations:
- - "ntp:juju-info"
- - "nodes-api:juju-info"
- - - "ntp:juju-info"
- - "nodes-compute:juju-info"
-openstack-phase2:
+ - "nodes:juju-info"
+openstack-phase2:
inherits: openstack-phase1
services:
ceilometer:
charm: "local:trusty/ceilometer"
- num_units: 1
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
ceilometer-agent:
charm: "local:trusty/ceilometer-agent"
ceph:
@@ -39,8 +31,8 @@ openstack-phase2:
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
+ - "lxc:nodes=0"
ceph-osd:
charm: "local:trusty/ceph-osd"
num_units: 2
@@ -48,86 +40,76 @@ openstack-phase2:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "nodes=0"
+ - "nodes=1"
ceph-radosgw:
charm: "local:trusty/ceph-radosgw"
- num_units: 1
options:
use-embedded-webserver: true
operator-roles: "Member,admin"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
cinder:
charm: "local:trusty/cinder"
- num_units: 1
options:
block-device: None
glance-api-version: 2
ha-mcastport: 5401
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
cinder-ceph:
charm: "local:trusty/cinder-ceph"
- num_units: 0
glance:
charm: "local:trusty/glance"
- num_units: 1
options:
ha-mcastport: 5402
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
opnfv-promise:
charm: local:trusty/promise
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
keystone:
charm: "local:trusty/keystone"
- num_units: 1
options:
admin-password: openstack
admin-token: admin
ha-mcastport: 5403
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
mongodb:
charm: local:trusty/mongodb
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
mysql:
charm: "local:trusty/percona-cluster"
- num_units: 1
options:
max-connections: 20000
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
neutron-api:
charm: "local:trusty/neutron-api"
- num_units: 1
options:
neutron-security-groups: true
flat-network-providers: "*"
# overlay-network-type: vxlan
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
neutron-gateway:
charm: "local:trusty/neutron-gateway"
- num_units: 1
options:
instance-mtu: 1400
#ext-port: "eth1"
to:
- - "nodes-api=0"
+ - "nodes=0"
neutron-openvswitch:
charm: "local:trusty/neutron-openvswitch"
- num_units: 0
nova-cloud-controller:
charm: "local:trusty/nova-cloud-controller"
- num_units: 1
options:
network-manager: Neutron
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
nova-compute:
charm: "local:trusty/nova-compute"
num_units: 2
@@ -137,28 +119,23 @@ openstack-phase2:
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"
+ - "nodes=0"
+ - "nodes=1"
openstack-dashboard:
charm: "local:trusty/openstack-dashboard"
- num_units: 1
options:
secret: admin
webroot: /
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
rabbitmq-server:
charm: "local:trusty/rabbitmq-server"
- num_units: 1
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
heat:
charm: "local:trusty/heat"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
relations:
- - nova-compute:amqp
- rabbitmq-server:amqp
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index ce2f25df..0ea197d5 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -2,48 +2,38 @@
openstack-phase1:
series: trusty
services:
- nodes-api:
- charm: "cs:trusty/ubuntu"
- num_units: 1
- constraints: tags=control
- nodes-compute:
+ nodes:
charm: "cs:trusty/ubuntu"
num_units: 2
- constraints: tags=compute
ntp:
charm: "local:trusty/ntp"
relations:
- - "ntp:juju-info"
- - "nodes-api:juju-info"
- - - "ntp:juju-info"
- - "nodes-compute:juju-info"
+ - "nodes:juju-info"
openstack-phase2:
inherits: openstack-phase1
services:
mysql:
charm: "local:trusty/percona-cluster"
- num_units: 1
options:
dataset-size: 2G
max-connections: 10000
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
ceilometer:
charm: "local:trusty/ceilometer"
- num_units: 1
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
ceilometer-agent:
charm: "local:trusty/ceilometer-agent"
mongodb:
charm: "local:trusty/mongodb"
- num_units: 1
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
heat:
charm: "local:trusty/heat"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
ceph:
charm: "local:trusty/ceph"
num_units: 2
@@ -51,13 +41,13 @@ openstack-phase2:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
osd-devices: ""
- monitor-count: 1
+ monitor-count: 2
# osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "lxc:nodes-api=0"
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
+ - "lxc:nodes=1"
ceph-osd:
charm: "local:trusty/ceph-osd"
num_units: 2
@@ -65,50 +55,45 @@ openstack-phase2:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "nodes=0"
+ - "nodes=1"
ceph-radosgw:
charm: "local:trusty/ceph-radosgw"
- num_units: 1
options:
use-embedded-webserver: true
operator-roles: "Member,admin"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
cinder:
charm: "local:trusty/cinder"
- num_units: 1
options:
block-device: None
glance-api-version: 2
# ha-mcastport: 5401
# openstack-origin-git: include-file://cinder-master.yaml
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
cinder-ceph:
charm: "local:trusty/cinder-ceph"
rabbitmq-server:
charm: "local:trusty/rabbitmq-server"
- num_units: 1
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
keystone:
charm: "local:trusty/keystone"
- num_units: 1
options:
openstack-origin-git: include-file://keystone-master.yaml
admin-password: openstack
admin-token: admin
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
openstack-dashboard:
charm: "local:trusty/openstack-dashboard"
- num_units: 1
options:
openstack-origin-git: include-file://horizon-master.yaml
secret: admin
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
nova-compute:
charm: local:trusty/nova-compute
num_units: 2
@@ -119,25 +104,23 @@ openstack-phase2:
manage-neutron-plugin-legacy-mode: false
migration-auth-type: ssh
to:
- - "nodes-compute=0"
- - "nodes-compute=1"
+ - "nodes=0"
+ - "nodes=1"
nova-cloud-controller:
charm: "local:trusty/nova-cloud-controller"
- num_units: 1
options:
openstack-origin-git: include-file://nova-master.yaml
console-access-protocol: novnc
network-manager: Neutron
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
neutron-api:
charm: local:charms/trusty/neutron-api
- num_units: 1
options:
neutron-security-groups: True
flat-network-providers: "*"
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
neutron-gateway:
charm: "local:trusty/neutron-gateway"
options:
@@ -145,18 +128,17 @@ openstack-phase2:
instance-mtu: 1400
#ext-port: "eth1"
to:
- - "nodes-api=0"
+ - "nodes=0"
glance:
charm: "local:trusty/glance"
- num_units: 1
options:
openstack-origin-git: include-file://glance-master.yaml
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=1"
opnfv-promise:
charm: local:trusty/promise
to:
- - "lxc:nodes-api=0"
+ - "lxc:nodes=0"
neutron-openvswitch:
charm: "local:trusty/neutron-openvswitch"
options: