diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 05:50:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-12 05:50:40 +0000 |
| commit | 06ecf10474d77fc2d415d1d7bcd5cdf32099ae52 (patch) | |
| tree | 6909f25c6061ad6e89064120c46dffa0c8605a64 /ci/opencontrail/juju-deployer | |
| parent | 6434a0cec7309d16ca220c19a395a92caf143ac7 (diff) | |
| parent | c1aaa2cc1c163928f0f6fd7dbd1bd68b594fc698 (diff) | |
Merge "modified on the lines of nosdn bundle tested. Only single gateway needed for ceph. Modified bundle to include the role as admin instead of Admin. As Admin create by default." into stable/brahmaputra
Diffstat (limited to 'ci/opencontrail/juju-deployer')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 5 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-tip.yaml | 1 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail.yaml | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 1c70e73d..c837eebf 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -117,14 +117,12 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 3 + num_units: 1 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw num_units: 3 @@ -161,6 +159,7 @@ openstack-phase2: options: "admin-password": openstack "admin-token": admin + "admin-role": admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index ca7ad4ae..59379d0e 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -107,6 +107,7 @@ openstack-phase2: openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index f01d68eb..fa9647bc 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -106,6 +106,7 @@ openstack-phase2: options: "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": |