diff options
Diffstat (limited to 'ci/opencontrail')
| -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": |