summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer
diff options
context:
space:
mode:
authorDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-28 16:19:39 +0100
committerDavid Blaisonneau <david.blaisonneau@orange.com>2016-01-28 16:52:34 +0100
commitaf0e297456a0646ea6d3e14cc63cb4a199dac506 (patch)
tree8b45ae37851f5e4f9e5d417240887f2e3b567523 /ci/opencontrail/juju-deployer
parent77bd122e41e96a6dac164d45b750d2fc7c1c0c7f (diff)
joid: clean deployment files
Change-Id: I98115c2f15cd399a371fa63d974f3200750e0949 Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
Diffstat (limited to 'ci/opencontrail/juju-deployer')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml62
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml34
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml34
3 files changed, 65 insertions, 65 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 7e1e47d1..7bdfb73f 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -10,7 +10,7 @@ openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 2
constraints: tags=compute
- "ntp":
+ ntp:
charm: "cs:trusty/ntp"
zookeeper:
branch: lp:~charmers/charms/precise/zookeeper/trunk
@@ -37,51 +37,51 @@ openstack-phase1:
openstack-phase2:
inherits: openstack-phase1
services:
- "percona-cluster":
+ 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
+ dataset-size: 2G
+ lp1366997-workaround: true
+ max-connections: 10000
+ root-password: 293rhc395m
+ sst-password: 127rc14t51
vip: 10.4.1.15
to:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "hacluster-keystone":
+ hacluster-keystone:
branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
- "hacluster-horizon":
+ hacluster-horizon:
branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI='
- "hacluster-nova":
+ hacluster-nova:
branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk='
- "hacluster-neutron":
+ hacluster-neutron:
branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0='
- "hacluster-glance":
+ hacluster-glance:
branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
corosync_key: |
'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI='
- "hacluster-ceilometer":
+ 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:
@@ -90,9 +90,9 @@ openstack-phase2:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "ceilometer-agent":
+ ceilometer-agent:
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
- "mongodb":
+ mongodb:
charm: "cs:trusty/mongodb"
num_units: 1
to:
@@ -147,25 +147,25 @@ openstack-phase2:
- "lxc:nodes-api=2"
cinder-ceph:
branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
- "rabbitmq-server":
+ rabbitmq-server:
branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
num_units: 3
to:
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
- "keystone":
+ keystone:
branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 3
options:
admin-password: openstack
- "admin-token": admin
+ admin-token: admin
vip: 10.4.1.13
to:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "openstack-dashboard":
+ openstack-dashboard:
branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 3
options:
@@ -176,33 +176,33 @@ openstack-phase2:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=2"
- "nova-compute":
+ nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 2
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"
- "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
- "neutron-external-network": ext_net
+ console-access-protocol: novnc
+ network-manager: Neutron
+ quantum-security-groups: "yes"
+ service-guard: true
+ neutron-external-network: ext_net
vip: 10.4.1.16
to:
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
- "neutron-api":
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 3
options:
@@ -213,7 +213,7 @@ openstack-phase2:
- "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "glance":
+ glance:
branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 3
options:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index f8380cc0..3ad1d7bf 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
@@ -10,7 +10,7 @@ openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=compute
- "ntp":
+ ntp:
charm: "cs:trusty/ntp"
zookeeper:
branch: lp:~charmers/charms/precise/zookeeper/trunk
@@ -31,25 +31,25 @@ openstack-phase1:
openstack-phase2:
inherits: openstack-phase1
services:
- "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"
- "mongodb":
+ mongodb:
charm: "cs:trusty/mongodb"
num_units: 1
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"
heat:
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
@@ -95,20 +95,20 @@ openstack-phase2:
- "lxc:nodes-api=0"
cinder-ceph:
branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next
- "rabbitmq-server":
+ rabbitmq-server:
branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
num_units: 1
to:
- "lxc:nodes-api=0"
- "keystone":
+ keystone:
branch: lp:~openstack-charmers/charms/trusty/keystone/next
num_units: 1
options:
admin-password: openstack
- "admin-token": admin
+ admin-token: admin
to:
- "lxc:nodes-api=0"
- "openstack-dashboard":
+ openstack-dashboard:
branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 1
options:
@@ -116,29 +116,29 @@ openstack-phase2:
webroot: /
to:
- "lxc:nodes-api=0"
- "nova-compute":
+ nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
num_units: 1
options:
- "manage-neutron-plugin-legacy-mode": False
+ manage-neutron-plugin-legacy-mode: False
to:
- "nodes-compute=0"
# - "nodes-compute=1"
- "nova-cloud-controller":
+ nova-cloud-controller:
branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
num_units: 1
options:
- "network-manager": Neutron
+ network-manager: Neutron
to:
- "lxc:nodes-api=0"
- "neutron-api":
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
manage-neutron-plugin-legacy-mode: False
to:
- "lxc:nodes-api=0"
- "glance":
+ glance:
branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 1
to:
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index cf621401..be33b98c 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
@@ -10,7 +10,7 @@ openstack-phase1:
charm: "cs:trusty/ubuntu"
num_units: 1
constraints: tags=compute
- "ntp":
+ ntp:
charm: "cs:trusty/ntp"
zookeeper:
branch: lp:~charmers/charms/precise/zookeeper/trunk
@@ -31,25 +31,25 @@ openstack-phase1:
openstack-phase2:
inherits: openstack-phase1
services:
- "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"
- "mongodb":
+ mongodb:
charm: "cs:trusty/mongodb"
num_units: 1
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"
heat:
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
@@ -94,21 +94,21 @@ openstack-phase2:
- "lxc:nodes-api=0"
cinder-ceph:
branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
- "rabbitmq-server":
+ rabbitmq-server:
branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
num_units: 1
to:
- "lxc:nodes-api=0"
- "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-token: admin
to:
- "lxc:nodes-api=0"
- "openstack-dashboard":
+ openstack-dashboard:
branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
num_units: 1
options:
@@ -117,31 +117,31 @@ openstack-phase2:
webroot: /
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
- "manage-neutron-plugin-legacy-mode": False
+ manage-neutron-plugin-legacy-mode: False
to:
- "nodes-compute=0"
# - "nodes-compute=1"
- "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
- "network-manager": Neutron
+ network-manager: Neutron
to:
- "lxc:nodes-api=0"
- "neutron-api":
+ neutron-api:
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
num_units: 1
options:
manage-neutron-plugin-legacy-mode: False
to:
- "lxc:nodes-api=0"
- "glance":
+ glance:
branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 1
options: