charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=compute
- "ntp":
+ ntp:
charm: "cs:trusty/ntp"
relations:
- - "ntp:juju-info"
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:
- "dataset-size": 2G
- "max-connections": 10000
+ dataset-size: 2G
+ max-connections: 10000
to:
- "lxc:nodes-api=0"
- "ceilometer":
+ ceilometer:
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"
- "mongodb":
+ mongodb:
charm: "cs:trusty/mongodb"
num_units: 1
to:
- "lxc:nodes-api=0"
- "heat":
+ heat:
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
to:
- "lxc:nodes-api=0"
ceph:
- charm: cs:trusty/ceph
+ branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 1
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
+ osd-devices: ""
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
+ 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"
-# - "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
+ operator-roles: "Member,admin"
+ 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
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"
- "keystone":
- branch: lp:charms/trusty/keystone
+ keystone:
+ branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
num_units: 1
options:
openstack-origin-git: include-file://keystone-master.yaml
- "admin-password": openstack
- "admin-token": admin
+ admin-password: openstack
+ admin-token: admin
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:
openstack-origin-git: include-file://horizon-master.yaml
secret: admin
to:
- "lxc:nodes-api=0"
- "nova-compute":
+ nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
options:
openstack-origin-git: include-file://nova-master.yaml
- "enable-live-migration": False
- "manage-neutron-plugin-legacy-mode": False
+ enable-live-migration: true
+ enable-resize: true
+ manage-neutron-plugin-legacy-mode: false
+ migration-auth-type: ssh
to:
- "nodes-compute=0"
# - "nodes-compute=1"
- "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:
openstack-origin-git: include-file://nova-master.yaml
- "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"
- "neutron-api":
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
branch: "lp:~wuwenbin2/onosfw/neutron-gateway"
options:
openstack-origin-git: include-file://neutron-master.yaml
-# "ext-port": "eth1"
- plugin: ovs-onos
+ #ext-port: "eth1"
+ 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"
- "glance":
- branch: lp:charms/trusty/glance
+ glance:
+ branch: "lp:~openstack-charmers/charms/trusty/glance/next"
num_units: 1
options:
openstack-origin-git: include-file://glance-master.yaml
to:
- "lxc:nodes-api=0"
+ opnfv-promise:
+ branch: lp:~narindergupta/charms/trusty/promise/trunk
+ num_units: 1
+ to:
+ - "lxc:nodes-api=0"
neutron-api-onos:
branch: "lp:~wuwenbin2/onosfw/neutron-api-onos"
options:
- "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:
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"
- "openstack-origin": "cloud:trusty-liberty"
+ openstack-origin: "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
admin-role: admin
overrides:
region: Canonical
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
#prefer-ipv6: true
openstack-origin: cloud:trusty-kilo
source: cloud:trusty-kilo
Code Review / joid.git / blobdiff