series: trusty
services:
nodes-api:
- charm: "local:trusty/ubuntu-nodes-controller"
+ charm: "cs:trusty/ubuntu"
num_units: 3
constraints: tags=control
nodes-compute:
- charm: "local:trusty/ubuntu-nodes-compute"
- num_units: 1
+ charm: "cs:trusty/ubuntu"
+ num_units: 2
constraints: tags=compute
- "ntp":
+ ntp:
charm: "cs:trusty/ntp"
relations:
- - "ntp:juju-info"
- "nodes-api:juju-info"
- - "ntp:juju-info"
- "nodes-compute:juju-info"
-openstack-phase2:
+openstack-phase2:
inherits: openstack-phase1
- services:
- "percona-cluster":
- charm: "cs:trusty/percona-cluster"
+ services:
+ percona-cluster:
+ branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 3
- options:
- "dataset-size": 2G
- "lp1366997-workaround": true
- "max-connections": 10000
- "root-password": 293rhc395m
- "sst-password": 127rc14t51
+ options:
+ dataset-size: 2G
+ lp1366997-workaround: true
+ max-connections: 10000
+ root-password: 293rhc395m
+ sst-password: 127rc14t51
vip: 10.4.1.15
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
- "hacluster-keystone":
- charm: "cs:trusty/hacluster"
+ hacluster-keystone:
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
- "hacluster-horizon":
- charm: "cs:trusty/hacluster"
+ hacluster-horizon:
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
- "hacluster-nova":
- charm: "cs:trusty/hacluster"
+ hacluster-nova:
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
- "hacluster-neutron":
- charm: "cs:trusty/hacluster"
+ hacluster-neutron:
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
- "hacluster-glance":
- charm: "cs:trusty/hacluster"
+ hacluster-glance:
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
- "hacluster-ceilometer":
- charm: "cs:trusty/hacluster"
+ hacluster-ceilometer:
+ branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
- "ceilometer":
+ ceilometer:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
num_units: 3
options:
vip: 10.4.1.14
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
- "ceilometer-agent":
+ ceilometer-agent:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
- "mongodb":
+ mongodb:
charm: "cs:trusty/mongodb"
num_units: 1
to:
to:
- "lxc:nodes-api=0"
ceph:
- charm: :trusty/ceph
- num_units: 1
+ branch: lp:~openstack-charmers/charms/trusty/ceph/next
+ num_units: 3
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
- osd-devices: /srv
- monitor-count: 1
-# osd-reformat: 'yes'
+ osd-devices: ""
+ monitor-count: 3
+# osd-reformat: 'false'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
+ to:
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=1"
+ - "lxc:nodes-api=2"
+ ceph-osd:
+ branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
+ num_units: 2
+ 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"
+ - "nodes-compute=1"
+# - "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: 3
options:
block-device: None
glance-api-version: 2
# ha-mcastport: 5401
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
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: 3
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
- "keystone":
- branch: lp:charms/trusty/keystone
+ keystone:
+ branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 3
- options:
+ options:
# ha-mcastport: 5402
- "admin-password": openstack
- "admin-token": admin
+ admin-password: openstack
+ admin-token: admin
vip: 10.4.1.13
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "openstack-dashboard":
- branch: lp:charms/trusty/openstack-dashboard
+ openstack-dashboard:
+ branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 3
- options:
+ options:
secret: admin
vip: 10.4.1.11
webroot: /
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
- "nova-compute":
+ nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- num_units: 1
- options:
- "enable-live-migration": False
- "manage-neutron-plugin-legacy-mode": False
+ num_units: 2
+ 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-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: 3
- options:
- "console-access-protocol": novnc
- "network-manager": Neutron
- "quantum-security-groups": "yes"
- "service-guard": true
+ options:
+ console-access-protocol: novnc
+ network-manager: Neutron
+ service-guard: true
+ neutron-external-network: ext_net
vip: 10.4.1.16
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
- "neutron-api":
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 3
options:
neutron-security-groups: True
manage-neutron-plugin-legacy-mode: False
vip: 10.4.1.17
- to:
+ to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-gateway:
- branch: lp:charms/trusty/neutron-gateway
+ branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
options:
-# "ext-port": "eth1"
+ #ext-port: "eth1"
plugin: ovs-odl
instance-mtu: 1400
- to:
+ to:
- "nodes-api=0"
odl-controller:
- branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk
+ branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
options:
- install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz"
+ install-url: "https://nexus.opendaylight.org/content/repositories/staging/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium-RC2/distribution-karaf-0.4.0-Beryllium-RC2.tar.gz"
+ profile: "openvswitch-odl-Be"
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"
-
- to:
+ to:
- "lxc:nodes-api=1"
- "glance":
- branch: lp:charms/trusty/glance
+ glance:
+ branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 3
- options:
+ options:
vip: 10.4.1.12
# ha-mcastport: 5402
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
+ - "lxc:nodes-api=2"
+ opnfv-promise:
+ branch: lp:~narindergupta/charms/trusty/promise/trunk
+ num_units: 1
+ to:
- "lxc:nodes-api=2"
neutron-api-odl:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
+ branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next
options:
overlay-network-type: 'vxlan gre'
security-groups: True
- "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:
inherits: openstack-phase2
overrides:
- cluster_count: 3
+# cluster_count: 3
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
+ #prefer-ipv6: true
+ #enable-dvr: true
+ #l2-population: true
+ #ext-port: "eth1"
region: Canonical
source: "cloud:trusty-liberty"
- "openstack-origin": "cloud:trusty-liberty"
+ openstack-origin: "cloud:trusty-liberty"
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
trusty-kilo:
inherits: openstack-phase2
overrides:
- cluster_count: 3
+# cluster_count: 3
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
+ #prefer-ipv6: true
+ #enable-dvr: true
+ #l2-population: true
+ #ext-port: "eth1"
region: Canonical
source: "cloud:trusty-kilo"
- "openstack-origin": "cloud:trusty-kilo"
+ openstack-origin: "cloud:trusty-kilo"
series: trusty
- ceph-osd-replication-count: 1
-
+ ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
trusty-juno-nodes:
inherits: openstack-phase1
trusty-juno:
inherits: openstack-phase2
overrides:
- cluster_count: 3
+# cluster_count: 3
#os-data-network: 10.4.8.0/21
+ #ceph-cluster-network: 10.4.0.0/21
+ #prefer-ipv6: true
+ #enable-dvr: true
+ #l2-population: true
+ #ext-port: "eth1"
region: Canonical
source: "cloud:trusty-juno"
- "openstack-origin": "cloud:trusty-juno"
+ openstack-origin: "cloud:trusty-juno"
series: trusty
- ceph-osd-replication-count: 1
-
-
+ ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
Code Review / joid.git / blobdiff