From 4dcd9cf1a23df3eab9821c2de0271cb1a514d463 Mon Sep 17 00:00:00 2001 From: David Blaisonneau Date: Thu, 28 Jan 2016 16:19:39 +0100 Subject: [PATCH] joid: clean deployment files Change-Id: I98115c2f15cd399a371fa63d974f3200750e0949 Signed-off-by: David Blaisonneau (cherry picked from commit af0e297456a0646ea6d3e14cc63cb4a199dac506) --- ci/01-deploybundle.sh | 14 ++--- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 10 ++-- ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 10 ++-- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 46 +++++++------- ci/odl/juju-deployer/ovs-odl-ha.yaml | 70 +++++++++++----------- ci/odl/juju-deployer/ovs-odl-nonha.yaml | 48 +++++++-------- ci/odl/juju-deployer/ovs-odl-tip.yaml | 46 +++++++------- ci/onos/juju-deployer/ovs-onos-ha.yaml | 68 ++++++++++----------- ci/onos/juju-deployer/ovs-onos-nonha.yaml | 48 +++++++-------- ci/onos/juju-deployer/ovs-onos-tip.yaml | 46 +++++++------- .../juju-deployer/ovs-opencontrail-ha.yaml | 62 +++++++++---------- .../juju-deployer/ovs-opencontrail-nonha.yaml | 34 +++++------ .../juju-deployer/ovs-opencontrail-tip.yaml | 34 +++++------ 13 files changed, 268 insertions(+), 268 deletions(-) diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 882218cd..caa34620 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -26,7 +26,7 @@ case "$3" in # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 192.168.12.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml ;; 'intelpod6' ) # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 @@ -34,7 +34,7 @@ case "$3" in # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth2"/g' ./bundles.yaml ;; 'intelpod5' ) # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 @@ -42,25 +42,25 @@ case "$3" in # choose the correct interface to use for data network sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth2.724"/g' ./bundles.yaml ;; 'attvirpod1' ) # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20 sed -i -- 's/10.4.1.1/192.168.10.1/g' ./bundles.yaml # Choose the external port to go out from gateway to use. - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml ;; 'cengnlynxpod1' ) sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.1202"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth2.1202"/g' ./bundles.yaml ;; 'juniperpod1' ) sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml ;; 'default' ) sed -i -- 's/10.4.1.1/192.168.122.1/g' ./bundles.yaml - sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth1"/g' ./bundles.yaml + sed -i -- 's/# ext-port: "eth1"/ ext-port: "eth1"/g' ./bundles.yaml ;; esac diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index f22bd535..2df32d7f 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -134,7 +134,7 @@ openstack-phase2: branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" num_units: 1 options: -# "ext-port": "eth1" +# ext-port: "eth1" instance-mtu: 1400 to: - "nodes-api=0" @@ -328,7 +328,7 @@ trusty-liberty: #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: 2 admin-role: admin @@ -347,7 +347,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 2 admin-role: admin @@ -366,7 +366,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 2 admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 3be7e824..1d14b5b5 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -113,7 +113,7 @@ openstack-phase2: num_units: 1 options: instance-mtu: 1400 -# "ext-port": "eth1" +# ext-port: "eth1" to: - "nodes-api=0" neutron-openvswitch: @@ -262,7 +262,7 @@ trusty-liberty: #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 @@ -281,7 +281,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 1 admin-role: admin @@ -300,7 +300,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 1 admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 98f1d121..333ecb22 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,27 +20,27 @@ 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" - "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" @@ -84,21 +84,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: @@ -106,27 +106,27 @@ openstack-phase2: 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: 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 - "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: @@ -139,10 +139,10 @@ openstack-phase2: options: openstack-origin-git: include-file://neutron-master.yaml instance-mtu: 1400 -# "ext-port": "eth1" +# ext-port: "eth1" to: - "nodes-api=0" - "glance": + glance: branch: "lp:~openstack-charmers/charms/trusty/glance/next" num_units: 1 options: @@ -258,7 +258,7 @@ trusty-liberty: #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 diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 396d2f7d..4c9c2c70 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,51 +20,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=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" - "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: @@ -73,9 +73,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: @@ -130,26 +130,26 @@ 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=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "keystone": + keystone: branch: lp:~openstack-charmers/charms/trusty/keystone/next num_units: 3 options: # ha-mcastport: 5402 admin-password: openstack - "admin-token": admin + admin-token: admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "openstack-dashboard": + openstack-dashboard: branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next num_units: 3 options: @@ -160,33 +160,33 @@ openstack-phase2: - "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: 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=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "neutron-api": + neutron-api: branch: lp:~openstack-charmers/charms/trusty/neutron-api/next num_units: 3 options: @@ -200,7 +200,7 @@ openstack-phase2: 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: @@ -215,7 +215,7 @@ openstack-phase2: https-proxy: "http://squid.internal:3128" to: - "lxc:nodes-api=1" - "glance": + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 options: @@ -355,7 +355,7 @@ trusty-liberty: #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: 2 admin-role: admin @@ -375,7 +375,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 2 admin-role: admin @@ -395,7 +395,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 2 admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 3758757a..fcc5fb4c 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,22 +20,22 @@ 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" - "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: @@ -83,21 +83,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: # ha-mcastport: 5402 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: @@ -105,28 +105,28 @@ 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: - "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: 1 options: - "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: @@ -137,7 +137,7 @@ openstack-phase2: 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: @@ -152,7 +152,7 @@ openstack-phase2: https-proxy: "http://squid.internal:3128" to: - "lxc:nodes-api=0" - "glance": + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 to: @@ -273,7 +273,7 @@ trusty-liberty: #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 @@ -292,7 +292,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 1 admin-role: admin @@ -311,7 +311,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 1 admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 0542404a..75411f53 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,27 +20,27 @@ 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" - "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" @@ -84,21 +84,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: @@ -106,27 +106,27 @@ openstack-phase2: 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: 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 - "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: @@ -138,7 +138,7 @@ openstack-phase2: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: openstack-origin-git: include-file://neutron-master.yaml -# "ext-port": "eth1" +# ext-port: "eth1" plugin: ovs-odl instance-mtu: 1400 to: @@ -153,7 +153,7 @@ openstack-phase2: https-proxy: "http://squid.internal:3128" to: - "lxc:nodes-api=1" - "glance": + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 options: @@ -276,7 +276,7 @@ trusty-liberty: #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 diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 10b9736d..e495b377 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,51 +20,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=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" - "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: @@ -73,9 +73,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: @@ -132,26 +132,26 @@ openstack-phase2: - "lxc:nodes-api=1" 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=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "keystone": + keystone: branch: "lp:~openstack-charmers/charms/trusty/keystone/next" num_units: 3 options: # ha-mcastport: 5402 admin-password: openstack - "admin-token": admin + admin-token: admin vip: 10.4.1.13 to: - "lxc:nodes-api=1" - "lxc:nodes-api=0" - "lxc:nodes-api=2" - "openstack-dashboard": + openstack-dashboard: branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next" num_units: 3 options: @@ -162,32 +162,32 @@ openstack-phase2: - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "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 + console-access-protocol: novnc + network-manager: Neutron + quantum-security-groups: "yes" + service-guard: true 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: @@ -201,7 +201,7 @@ openstack-phase2: neutron-gateway: branch: "lp:~wuwenbin2/onosfw/neutron-gateway" options: -# "ext-port": "eth1" +# ext-port: "eth1" plugin: onos instance-mtu: 1400 to: @@ -210,7 +210,7 @@ openstack-phase2: branch: "lp:~wuwenbin2/onosfw/onos-controller" to: - "lxc:nodes-api=1" - "glance": + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 options: @@ -350,7 +350,7 @@ trusty-liberty: #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: 2 admin-role: admin @@ -370,7 +370,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 2 admin-role: admin @@ -390,7 +390,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 2 admin-role: admin diff --git a/ci/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml index 616f39ab..68e3288f 100644 --- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,22 +20,22 @@ 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" - "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: @@ -83,21 +83,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: # ha-mcastport: 5402 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: @@ -105,28 +105,28 @@ 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: - "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: 1 options: - "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: @@ -137,7 +137,7 @@ openstack-phase2: neutron-gateway: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: -# "ext-port": "eth1" +# ext-port: "eth1" plugin: onos instance-mtu: 1400 to: @@ -146,7 +146,7 @@ openstack-phase2: branch: "lp:~wuwenbin2/onosfw/onos-controller" to: - "lxc:nodes-api=0" - "glance": + glance: branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 1 to: @@ -267,7 +267,7 @@ trusty-liberty: #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 @@ -286,7 +286,7 @@ trusty-kilo: #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" + openstack-origin: "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 1 admin-role: admin @@ -305,7 +305,7 @@ trusty-juno: #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" + openstack-origin: "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 1 admin-role: admin diff --git a/ci/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml index 4009f85d..ba47f67b 100644 --- a/ci/onos/juju-deployer/ovs-onos-tip.yaml +++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml @@ -10,7 +10,7 @@ openstack-phase1: charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute - "ntp": + ntp: charm: "cs:trusty/ntp" relations: - - "ntp:juju-info" @@ -20,27 +20,27 @@ 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" - "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" @@ -84,21 +84,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: @@ -106,27 +106,27 @@ openstack-phase2: 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: 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 - "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: @@ -138,7 +138,7 @@ openstack-phase2: branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next" options: openstack-origin-git: include-file://neutron-master.yaml -# "ext-port": "eth1" +# ext-port: "eth1" plugin: onos instance-mtu: 1400 to: @@ -147,7 +147,7 @@ openstack-phase2: branch: "lp:~wuwenbin2/onosfw/onos-controller" to: - "lxc:nodes-api=0" - "glance": + glance: branch: "lp:~openstack-charmers/charms/trusty/glance/next" num_units: 1 options: @@ -268,7 +268,7 @@ trusty-liberty: #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 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: -- 2.16.6