num_units: 2
constraints: tags=compute
ntp:
- charm: "cs:trusty/ntp"
+ charm: "local:trusty/ntp"
relations:
- - "ntp:juju-info"
- "nodes-api:juju-info"
inherits: openstack-phase1
services:
percona-cluster:
- branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
+ charm: "local:trusty/percona-cluster"
num_units: 3
options:
dataset-size: 2G
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
hacluster-keystone:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ charm: "local:trusty/hacluster"
options:
corosync_key: |
'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
- hacluster-heat:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
- options:
- corosync_key: |
- 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkxMikuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gOTYwKS4KUHJlc3Mga2V5cyBvbiB5b3VyIGtleWJvYXJkIHRvIGdlbmVyYX'
+# hacluster-heat:
+# charm: "local:trusty/hacluster"
+# options:
+# corosync_key: |
+# 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkxMikuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gOTYwKS4KUHJlc3Mga2V5cyBvbiB5b3VyIGtleWJvYXJkIHRvIGdlbmVyYX'
hacluster-horizon:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ charm: "local:trusty/hacluster"
options:
corosync_key: |
'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
hacluster-nova:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ charm: "local:trusty/hacluster"
options:
corosync_key: |
'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
hacluster-neutron:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ charm: "local:trusty/hacluster"
options:
corosync_key: |
'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
hacluster-glance:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ charm: "local:trusty/hacluster"
options:
corosync_key: |
'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
hacluster-ceilometer:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+ charm: "local:trusty/hacluster"
options:
corosync_key: |
'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
ceilometer:
- branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
+ charm: "local:trusty/ceilometer"
num_units: 3
options:
vip: 10.4.1.14
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
ceilometer-agent:
- branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
+ charm: "local:trusty/ceilometer-agent"
mongodb:
- charm: "cs:trusty/mongodb"
+ charm: "local:trusty/mongodb"
num_units: 1
to:
- "lxc:nodes-api=0"
heat:
- branch: "lp:~openstack-charmers/charms/trusty/heat/next"
- num_units: 3
+ charm: "local:trusty/heat"
+ num_units: 1
options:
- vip: 10.4.1.18
+ #vip: 10.4.1.18
#os-public-hostname: api.public-fqdn
to:
- "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
+# - "lxc:nodes-api=1"
+# - "lxc:nodes-api=2"
ceph:
- branch: lp:~openstack-charmers/charms/trusty/ceph/next
+ charm: local:trusty/ceph
num_units: 3
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
ceph-osd:
- branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next
+ charm: local:trusty/ceph-osd
num_units: 2
options:
osd-devices: /srv
- "nodes-compute=1"
# - "nodes-api=0"
ceph-radosgw:
- branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next
+ charm: local:trusty/ceph-radosgw
num_units: 1
options:
use-embedded-webserver: true
to:
- "lxc:nodes-api=0"
cinder:
- branch: lp:~openstack-charmers/charms/trusty/cinder/next
+ charm: local:trusty/cinder
num_units: 3
options:
block-device: None
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
cinder-ceph:
- branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
+ charm: local:trusty/cinder-ceph
rabbitmq-server:
- branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
+ charm: local:trusty/rabbitmq-server
num_units: 3
to:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
keystone:
- branch: lp:~openstack-charmers/charms/trusty/keystone/next
+ charm: local:trusty/keystone
num_units: 3
options:
# ha-mcastport: 5402
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
openstack-dashboard:
- branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
+ charm: local:trusty/openstack-dashboard
num_units: 3
options:
secret: admin
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
nova-compute:
- branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
+ charm: local:trusty/nova-compute
num_units: 2
options:
enable-live-migration: true
# - "nodes-api=1"
# - "nodes-api=2"
nova-cloud-controller:
- branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
+ charm: local:trusty/nova-cloud-controller
num_units: 3
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
service-guard: true
neutron-external-network: ext_net
vip: 10.4.1.16
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
neutron-api:
- branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
+ charm: local:trusty/neutron-api
num_units: 3
options:
neutron-security-groups: True
- manage-neutron-plugin-legacy-mode: False
+ flat-network-providers: "*"
vip: 10.4.1.17
#os-public-hostname: api.public-fqdn
to:
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
neutron-gateway:
- branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
+ charm: local:trusty/neutron-gateway
options:
#ext-port: "eth1"
plugin: ovs-odl
to:
- "nodes-api=0"
odl-controller:
- branch: lp:~opnfv-team/charms/trusty/odl-controller/Be
+ charm: local:trusty/odl-controller
options:
- 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"
+ install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz"
+ profile: "openvswitch-odl-beryllium"
http-proxy: "http://squid.internal:3128"
https-proxy: "http://squid.internal:3128"
to:
- "lxc:nodes-api=1"
glance:
- branch: lp:~openstack-charmers/charms/trusty/glance/next
+ charm: local:trusty/glance
num_units: 3
options:
vip: 10.4.1.12
- "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/next
+ charm: local:trusty/neutron-api-odl
options:
overlay-network-type: 'vxlan gre'
security-groups: True
openvswitch-odl:
- branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
- haproxy:
- charm: cs:trusty/haproxy
- options:
- services: |
- - service_name: nova
- service_host: "0.0.0.0"
- service_port: 8774
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[nova, 10.4.1.16, 8774, check ]]
- - service_name: swift
- service_host: "0.0.0.0"
- service_port: 80
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[swift, 10.4.1.100, 80, check ]]
- - service_name: glance
- service_host: "0.0.0.0"
- service_port: 9292
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[glance, 10.4.1.12, 9292, check ]]
- - service_name: cinderv2
- service_host: "0.0.0.0"
- service_port: 8776
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[cinderv2, 10.4.1.100, 8776, check ]]
- - service_name: ceilometer
- service_host: "0.0.0.0"
- service_port: 8777
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[ceilometer, 10.4.1.14, 8777, check ]]
- - service_name: keystone
- service_host: "0.0.0.0"
- service_port: 5000
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[keystone, 10.4.1.13, 5000, check ]]
- - service_name: heat
- service_host: "0.0.0.0"
- service_port: 8004
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[heat, 10.4.1.18, 8004, check ]]
- - service_name: neutron
- service_host: "0.0.0.0"
- service_port: 9696
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[neutron, 10.4.1.17, 9696, check ]]
- - service_name: heat-cfn
- service_host: "0.0.0.0"
- service_port: 8000
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[heat-cfn, 192.168.2.162, 8000, check ]]
- - service_name: cinder
- service_host: "0.0.0.0"
- service_port: 8776
- service_options: [balance leastconn, cookie SRVNAME insert]
- server_options: maxconn 100 cookie S{i} check
- servers: [[cinder, 192.168.2.161, 8776, check ]]
- to:
- - "lxc:nodes-api=0"
+ charm: local:trusty/openvswitch-odl
+# haproxy:
+# charm: cs:trusty/haproxy
+# options:
+# services: |
+# - service_name: nova
+# service_host: "0.0.0.0"
+# service_port: 8774
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[nova, 10.4.1.16, 8774, check ]]
+# - service_name: swift
+# service_host: "0.0.0.0"
+# service_port: 80
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[swift, 10.4.1.100, 80, check ]]
+# - service_name: glance
+# service_host: "0.0.0.0"
+# service_port: 9292
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[glance, 10.4.1.12, 9292, check ]]
+# - service_name: cinderv2
+# service_host: "0.0.0.0"
+# service_port: 8776
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[cinderv2, 10.4.1.100, 8776, check ]]
+# - service_name: ceilometer
+# service_host: "0.0.0.0"
+# service_port: 8777
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[ceilometer, 10.4.1.14, 8777, check ]]
+# - service_name: keystone
+# service_host: "0.0.0.0"
+# service_port: 5000
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[keystone, 10.4.1.13, 5000, check ]]
+# - service_name: heat
+# service_host: "0.0.0.0"
+# service_port: 8004
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[heat, 10.4.1.18, 8004, check ]]
+# - service_name: neutron
+# service_host: "0.0.0.0"
+# service_port: 9696
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[neutron, 10.4.1.17, 9696, check ]]
+# - service_name: heat-cfn
+# service_host: "0.0.0.0"
+# service_port: 8000
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[heat-cfn, 192.168.2.162, 8000, check ]]
+# - service_name: cinder
+# service_host: "0.0.0.0"
+# service_port: 8776
+# service_options: [balance leastconn, cookie SRVNAME insert]
+# server_options: maxconn 100 cookie S{i} check
+# servers: [[cinder, 192.168.2.161, 8776, check ]]
+# to:
+# - "lxc:nodes-api=0"
relations:
- - "glance:ha"
- "hacluster-glance:ha"
- "hacluster-horizon:ha"
- - "ceilometer:ha"
- "hacluster-ceilometer:ha"
- - - "heat:ha"
- - "hacluster-heat:ha"
+# - - "heat:ha"
+# - "hacluster-heat:ha"
- - "neutron-api:neutron-plugin-api-subordinate"
- "neutron-api-odl:neutron-plugin-api-subordinate"
- - "nova-compute:neutron-plugin"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
-trusty-liberty-nodes:
+trusty-mitaka-nodes:
inherits: openstack-phase1
overrides:
series: trusty
-trusty-liberty:
+trusty-mitaka:
inherits: openstack-phase2
overrides:
# cluster_count: 3
#l2-population: true
#ext-port: "eth1"
region: Canonical
- source: "cloud:trusty-liberty"
- openstack-origin: "cloud:trusty-liberty"
+ #source: "cloud:trusty-mitaka"
+ openstack-origin: "cloud:trusty-mitaka"
series: trusty
ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
-trusty-kilo-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-trusty-kilo:
- inherits: openstack-phase2
- overrides:
-# 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"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
-
-trusty-juno-nodes:
- inherits: openstack-phase1
- overrides:
- series: trusty
-
-trusty-juno:
- inherits: openstack-phase2
- overrides:
-# 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"
- series: trusty
- ceph-osd-replication-count: 2
- admin-role: admin
- keystone-admin-role: admin
Code Review / joid.git / blobdiff