summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml2
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml25
6 files changed, 17 insertions, 19 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index 856fc9d7..662f190d 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -291,6 +291,7 @@ openstack-phase2:
charm: "local:trusty/nova-cloud-controller"
num_units: 3
options:
+ console-access-protocol: novnc
network-manager: Neutron
service-guard: true
vip: 10.4.1.16
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 73a8b3f0..39864ffd 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -7,7 +7,6 @@ trusty-mitaka-nodes:
trusty-mitaka:
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
@@ -337,7 +336,6 @@ openstack-phase2:
console-access-protocol: novnc
network-manager: Neutron
service-guard: true
- neutron-external-network: ext_net
vip: 10.4.1.16
#os-public-hostname: api.public-fqdn
to:
@@ -391,7 +389,7 @@ openstack-phase2:
neutron-api-odl:
charm: local:trusty/neutron-api-odl
options:
- overlay-network-type: 'vxlan gre'
+ overlay-network-type: 'vxlan'
security-groups: True
openvswitch-odl:
charm: local:trusty/openvswitch-odl
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 4c52b991..fc9e9edd 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -261,7 +261,7 @@ openstack-phase2:
neutron-api-odl:
charm: local:trusty/neutron-api-odl
options:
- overlay-network-type: 'vxlan gre'
+ overlay-network-type: 'vxlan'
security-groups: True
openvswitch-odl:
charm: local:trusty/openvswitch-odl
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index c01dad15..ed34e932 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -269,7 +269,7 @@ openstack-phase2:
neutron-api-odl:
charm: local:trusty/neutron-api-odl
options:
- overlay-network-type: 'vxlan gre'
+ overlay-network-type: 'vxlan'
security-groups: True
openvswitch-odl:
charm: local:trusty/openvswitch-odl
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index a6ad0efa..0d7a2b9f 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -24,7 +24,7 @@ openstack-phase1:
series: trusty
services:
nodes:
- charm: "local:trusty/ubuntu"
+ charm: "cs:trusty/ubuntu"
num_units: 5
ntp:
charm: "local:trusty/ntp"
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index ac0f03d9..99936e76 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -37,13 +37,13 @@ openstack-phase1:
- "nodes-api:juju-info"
- - "ntp:juju-info"
- "nodes-compute:juju-info"
-openstack-phase2:
+openstack-phase2:
inherits: openstack-phase1
- services:
- percona-cluster:
+ services:
+ percona-cluster:
branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
num_units: 3
- options:
+ options:
dataset-size: 2G
lp1366997-workaround: true
max-connections: 10000
@@ -179,10 +179,10 @@ 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:
+ options:
enable-live-migration: False
manage-neutron-plugin-legacy-mode: False
to:
@@ -191,34 +191,33 @@ openstack-phase2:
# - "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:
+ 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=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=2"
- neutron-api:
+ neutron-api:
branch: lp:~opnfv-team/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=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- glance:
+ glance:
branch: lp:~openstack-charmers/charms/trusty/glance/next
num_units: 3
- options:
+ options:
vip: 10.4.1.12
to:
- "lxc:nodes-api=1"