summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/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/nosdn/juju-deployer
parent77bd122e41e96a6dac164d45b750d2fc7c1c0c7f (diff)
joid: clean deployment files
Change-Id: I98115c2f15cd399a371fa63d974f3200750e0949 Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
Diffstat (limited to 'ci/nosdn/juju-deployer')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml10
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml10
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml46
3 files changed, 33 insertions, 33 deletions
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