diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-31 15:04:29 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-05-31 15:05:06 -0500 |
| commit | 885d85728ddfa5346a9391eda1ec224319b51f83 (patch) | |
| tree | 0b5e7d9ff75a0837f31f540fe4f862d5d1630a0f /ci/odl/juju-deployer | |
| parent | ec07b10b209d4a5cf076bafd716b2bfc33bdeb59 (diff) | |
modified for right syntax.
Change-Id: I6abcfbd8bbc5423003ba2dcee4c9fd0018542652
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/odl/juju-deployer')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 4 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 4 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index decb1cb7..e33fa8ec 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -145,6 +145,8 @@ openstack-phase2: - "ceph:radosgw" - - "ceph-radosgw:identity-service" - "keystone:identity-service" + #- - nova-compute:lxd + #- lxd:lxd services: hacluster-keystone: charm: "local:trusty/hacluster" @@ -322,6 +324,8 @@ openstack-phase2: enable-resize: true manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh + #virt-type: lxd + #hugepages: "50%" to: - "nodes=1" - "nodes=2" diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 60c30a95..ae3be75e 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -126,6 +126,8 @@ openstack-phase2: - "ceph:radosgw" - - "ceph-radosgw:identity-service" - "keystone:identity-service" + #- - nova-compute:lxd + #- lxd:lxd services: mysql: charm: "local:trusty/percona-cluster" @@ -214,6 +216,8 @@ openstack-phase2: enable-resize: true manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh + #virt-type: lxd + #hugepages: "50%" to: - "nodes=1" nova-cloud-controller: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index f3a5d43c..9034fea9 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -128,6 +128,8 @@ openstack-phase2: - "ceph:radosgw" - - "ceph-radosgw:identity-service" - "keystone:identity-service" + #- - nova-compute:lxd + #- lxd:lxd services: mysql: charm: "local:trusty/percona-cluster" @@ -218,6 +220,8 @@ openstack-phase2: enable-resize: true manage-neutron-plugin-legacy-mode: false migration-auth-type: ssh + #hugepages: "50%" + #virt-type: lxd to: - "nodes=1" nova-cloud-controller: |