summaryrefslogtreecommitdiffstats
path: root/ci/nosdn
diff options
context:
space:
mode:
Diffstat (limited to 'ci/nosdn')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml3
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml3
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml3
3 files changed, 9 insertions, 0 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index e9094fa3..cbc4233f 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -136,6 +136,8 @@ openstack-phase2:
- keystone:identity-service
- - heat:amqp
- rabbitmq-server:amqp
+ #- - nova-compute:lxd
+ # - lxd:lxd
services:
hacluster-keystone:
@@ -306,6 +308,7 @@ openstack-phase2:
manage-neutron-plugin-legacy-mode: false
migration-auth-type: ssh
#hugepages: '50%'
+ #virt-type: lxd
to:
- "nodes=1"
- "nodes=2"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 06792de5..562263d2 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -126,6 +126,8 @@ openstack-phase2:
- keystone:identity-service
- - heat:amqp
- rabbitmq-server:amqp
+ #- - nova-compute:lxd
+ # - lxd:lxd
services:
ceilometer:
charm: "local:trusty/ceilometer"
@@ -238,6 +240,7 @@ openstack-phase2:
manage-neutron-plugin-legacy-mode: false
migration-auth-type: ssh
#hugepages: '50%'
+ #virt-type: lxd
to:
- "nodes=1"
openstack-dashboard:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 3661b862..9b78d108 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -122,6 +122,8 @@ openstack-phase2:
- "ceph:radosgw"
- - "ceph-radosgw:identity-service"
- "keystone:identity-service"
+ #- - nova-compute:lxd
+ # - lxd:lxd
services:
mysql:
charm: "local:trusty/percona-cluster"
@@ -213,6 +215,7 @@ openstack-phase2:
manage-neutron-plugin-legacy-mode: false
migration-auth-type: ssh
#hugepages: '50%'
+ #virt-type: lxd
to:
- "nodes=1"
nova-cloud-controller: