Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
change permisson and retry.
[joid.git]
/
ci
/
nosdn
/
juju-deployer
/
ovs-nosdn-nonha.yaml
diff --git
a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index
b7d127d
..
3be7e82
100644
(file)
--- a/
ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/
ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@
-21,35
+21,35
@@
openstack-phase2:
inherits: openstack-phase1
services:
ceilometer:
inherits: openstack-phase1
services:
ceilometer:
- charm: cs:trusty/ceilometer
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
to:
- "lxc:nodes-api=0"
ceilometer-agent:
num_units: 1
to:
- "lxc:nodes-api=0"
ceilometer-agent:
- charm: cs:trusty/ceilometer-agent
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
ceph:
ceph:
- charm: cs:trusty/ceph
+ branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
num_units: 1
options:
monitor-count: 1
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
num_units: 1
options:
monitor-count: 1
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices:
/srv
- osd-reformat: 'yes'
+ osd-devices:
""
+
#
osd-reformat: 'yes'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
- - "
nodes-compute
=0"
+ - "
lxc:nodes-api
=0"
ceph-osd:
ceph-osd:
- charm: cs:trusty/ceph-osd
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
num_units: 1
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
num_units: 1
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-
api
=0"
+ - "nodes-
compute
=0"
ceph-radosgw:
ceph-radosgw:
- charm: cs:trusty/ceph-radosgw
+ branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
num_units: 1
options:
use-embedded-webserver: true
num_units: 1
options:
use-embedded-webserver: true
@@
-57,7
+57,7
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder:
to:
- "lxc:nodes-api=0"
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
@@
-66,17
+66,22
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
cinder-ceph:
to:
- "lxc:nodes-api=0"
cinder-ceph:
- charm: cs:trusty/cinder-ceph
+ branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
num_units: 0
glance:
num_units: 0
glance:
- charm: cs:trusty/glance
+ branch: "lp:~openstack-charmers/charms/trusty/glance/next"
num_units: 1
options:
ha-mcastport: 5402
to:
- "lxc:nodes-api=0"
num_units: 1
options:
ha-mcastport: 5402
to:
- "lxc:nodes-api=0"
+ opnfv-promise:
+ branch: lp:~narindergupta/charms/trusty/promise/trunk
+ num_units: 1
+ to:
+ - "lxc:nodes-api=0"
keystone:
keystone:
- charm: cs:trusty/keystone
+ branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 1
options:
admin-password: openstack
num_units: 1
options:
admin-password: openstack
@@
-97,14
+102,14
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
neutron-api:
to:
- "lxc:nodes-api=0"
neutron-api:
- charm: cs:trusty/neutron-api
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
num_units: 1
options:
neutron-security-groups: true
to:
- "lxc:nodes-api=0"
neutron-gateway:
num_units: 1
options:
neutron-security-groups: true
to:
- "lxc:nodes-api=0"
neutron-gateway:
- charm: cs:trusty/neutron-gateway
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
num_units: 1
options:
instance-mtu: 1400
num_units: 1
options:
instance-mtu: 1400
@@
-112,10
+117,10
@@
openstack-phase2:
to:
- "nodes-api=0"
neutron-openvswitch:
to:
- "nodes-api=0"
neutron-openvswitch:
- charm: cs:trusty/neutron-openvswitch
+ branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
num_units: 0
nova-cloud-controller:
num_units: 0
nova-cloud-controller:
- charm: cs:trusty/nova-cloud-controller
+ branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
num_units: 1
options:
network-manager: Neutron
num_units: 1
options:
network-manager: Neutron
@@
-123,7
+128,7
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
nova-compute:
to:
- "lxc:nodes-api=0"
nova-compute:
- charm: cs:trusty/nova-compute
+ branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
num_units: 1
options:
enable-live-migration: true
num_units: 1
options:
enable-live-migration: true
@@
-137,7
+142,7
@@
openstack-phase2:
# - "nodes-api=1"
# - "nodes-api=2"
openstack-dashboard:
# - "nodes-api=1"
# - "nodes-api=2"
openstack-dashboard:
- charm: cs:trusty/openstack-dashboard
+ branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
num_units: 1
options:
secret: admin
num_units: 1
options:
secret: admin
@@
-145,12
+150,12
@@
openstack-phase2:
to:
- "lxc:nodes-api=0"
rabbitmq-server:
to:
- "lxc:nodes-api=0"
rabbitmq-server:
- charm: cs:trusty/rabbitmq-server
+ branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
num_units: 1
to:
- "lxc:nodes-api=0"
heat:
num_units: 1
to:
- "lxc:nodes-api=0"
heat:
- charm: cs:trusty/heat
+ branch: "lp:~openstack-charmers/charms/trusty/heat/next"
to:
- "lxc:nodes-api=0"
relations:
to:
- "lxc:nodes-api=0"
relations:
@@
-253,6
+258,7
@@
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"
@@
-271,6
+277,7
@@
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"
@@
-289,6
+296,7
@@
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"