Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "modified to enable eth1 network in att lab."
[joid.git]
/
ci
/
onos
/
juju-deployer
/
ovs-onos-nonha.yaml
diff --git
a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index
136e774
..
5db6cb9
100644
(file)
--- a/
ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/
ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@
-10,7
+10,7
@@
openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=compute
charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=compute
-
"ntp"
:
+
ntp
:
charm: "cs:trusty/ntp"
relations:
- - "ntp:juju-info"
charm: "cs:trusty/ntp"
relations:
- - "ntp:juju-info"
@@
-20,22
+20,22
@@
openstack-phase1:
openstack-phase2:
inherits: openstack-phase1
services:
openstack-phase2:
inherits: openstack-phase1
services:
-
"mysql"
:
-
charm: "cs:trusty/mysql
"
+
mysql
:
+
branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next
"
num_units: 1
options:
num_units: 1
options:
-
"dataset-size"
: 2G
-
"max-connections"
: 10000
+
dataset-size
: 2G
+
max-connections
: 10000
to:
- "lxc:nodes-api=0"
to:
- "lxc:nodes-api=0"
-
"ceilometer"
:
+
ceilometer
:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
to:
- "lxc:nodes-api=0"
branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
to:
- "lxc:nodes-api=0"
-
"ceilometer-agent"
:
+
ceilometer-agent
:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
-
"mongodb"
:
+
mongodb
:
charm: "cs:trusty/mongodb"
num_units: 1
to:
charm: "cs:trusty/mongodb"
num_units: 1
to:
@@
-45,36
+45,35
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
ceph:
to:
- "lxc:nodes-api=0"
ceph:
- charm: cs:trusty/ceph
+ branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices:
/srv
+ osd-devices:
""
monitor-count: 1
monitor-count: 1
- osd-reformat: 'no'
+
#
osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
+ to:
+ - "lxc:nodes-api=0"
+ ceph-osd:
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
+ num_units: 1
+ options:
+ osd-devices: /srv
+ osd-reformat: 'yes'
to:
- "nodes-compute=0"
to:
- "nodes-compute=0"
-# - "nodes-compute=1"
-# ceph-osd:
-# charm: cs:trusty/ceph-osd
-# num_units: 1
-# options:
-# osd-devices: /dev/sdb
-# osd-reformat: 'yes'
-# to:
-# - "lxc:nodes-api=0"
-# ceph-radosgw:
-# charm: cs:trusty/ceph-radosgw
-# num_units: 1
-# options:
-# use-embedded-webserver: true
-# to:
-# - "lxc:nodes-api=0"
+ ceph-radosgw:
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
+ num_units: 1
+ options:
+ use-embedded-webserver: true
+ to:
+ - "lxc:nodes-api=0"
cinder:
cinder:
- charm: cs:trusty/cinder
+ branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
num_units: 1
options:
block-device: None
num_units: 1
options:
block-device: None
@@
-83,51
+82,51
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder-ceph:
to:
- "lxc:nodes-api=0"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
-
"rabbitmq-server"
:
- branch:
lp:charms/trusty/rabbitmq-server
+ branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
+
rabbitmq-server
:
+ branch:
"lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
num_units: 1
to:
- "lxc:nodes-api=0"
num_units: 1
to:
- "lxc:nodes-api=0"
-
"keystone"
:
- branch:
lp:charms/trusty/keystone
+
keystone
:
+ branch:
"lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 1
options:
# ha-mcastport: 5402
num_units: 1
options:
# ha-mcastport: 5402
-
"admin-password"
: openstack
-
"admin-token"
: admin
+
admin-password
: openstack
+
admin-token
: admin
to:
- "lxc:nodes-api=0"
to:
- "lxc:nodes-api=0"
-
"openstack-dashboard"
:
- branch:
lp:charms/trusty/openstack-dashboard
+
openstack-dashboard
:
+ branch:
"lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
num_units: 1
options:
secret: admin
webroot: /
to:
- "lxc:nodes-api=0"
num_units: 1
options:
secret: admin
webroot: /
to:
- "lxc:nodes-api=0"
-
"nova-compute"
:
+
nova-compute
:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
options:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
options:
-
"enable-live-migration"
: False
-
"manage-neutron-plugin-legacy-mode"
: False
+
enable-live-migration
: False
+
manage-neutron-plugin-legacy-mode
: False
to:
- "nodes-compute=0"
# - "nodes-compute=1"
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
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
+
nova-cloud-controller
:
+ branch:
"lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
num_units: 1
options:
num_units: 1
options:
-
"console-access-protocol"
: novnc
-
"network-manager"
: Neutron
-
"quantum-security-groups"
: "yes"
+
console-access-protocol
: novnc
+
network-manager
: Neutron
+
quantum-security-groups
: "yes"
to:
- "lxc:nodes-api=0"
to:
- "lxc:nodes-api=0"
-
"neutron-api"
:
+
neutron-api
:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
@@
-138,17
+137,24
@@
openstack-phase2:
neutron-gateway:
branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
neutron-gateway:
branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
-
# "ext-port"
: "eth1"
+
#ext-port
: "eth1"
plugin: onos
instance-mtu: 1400
to:
- "nodes-api=0"
onos-controller:
branch: "lp:~wuwenbin2/onosfw/onos-controller"
plugin: onos
instance-mtu: 1400
to:
- "nodes-api=0"
onos-controller:
branch: "lp:~wuwenbin2/onosfw/onos-controller"
+ options:
+ #ext-port: "eth1"
to:
- "lxc:nodes-api=0"
to:
- "lxc:nodes-api=0"
- "glance":
- branch: lp:charms/trusty/glance
+ glance:
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
+ num_units: 1
+ to:
+ - "lxc:nodes-api=0"
+ opnfv-promise:
+ branch: lp:~narindergupta/charms/trusty/promise/trunk
num_units: 1
to:
- "lxc:nodes-api=0"
num_units: 1
to:
- "lxc:nodes-api=0"
@@
-244,6
+250,12
@@
openstack-phase2:
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
- "cinder-ceph:ceph"
- - "ceph:client"
- "glance:ceph"
+ - - "ceph-osd:mon"
+ - "ceph:osd"
+ - - "ceph-radosgw:mon"
+ - "ceph:radosgw"
+ - - "ceph-radosgw:identity-service"
+ - "keystone:identity-service"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
@@
-253,10
+265,11
@@
trusty-liberty:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-liberty"
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-liberty"
-
"openstack-origin"
: "cloud:trusty-liberty"
+
openstack-origin
: "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
admin-role: admin
series: trusty
ceph-osd-replication-count: 1
admin-role: admin
@@
-271,10
+284,11
@@
trusty-kilo:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-kilo"
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-kilo"
-
"openstack-origin"
: "cloud:trusty-kilo"
+
openstack-origin
: "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 1
admin-role: admin
series: trusty
ceph-osd-replication-count: 1
admin-role: admin
@@
-289,10
+303,11
@@
trusty-juno:
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
inherits: openstack-phase2
overrides:
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-juno"
#prefer-ipv6: true
region: Canonical
source: "cloud:trusty-juno"
-
"openstack-origin"
: "cloud:trusty-juno"
+
openstack-origin
: "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 1
admin-role: admin
series: trusty
ceph-osd-replication-count: 1
admin-role: admin