diff options
Diffstat (limited to 'ci/opencontrail/juju-deployer/contrail-ha.yaml')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index c837eebf..a4494df3 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -159,7 +159,6 @@ openstack-phase2: options: "admin-password": openstack "admin-token": admin - "admin-role": admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" @@ -356,6 +355,8 @@ trusty-liberty: openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" ceph-osd-replication-count: 2 + admin-role: admin + trusty-kilo-nodes: inherits: openstack-phase1 @@ -374,6 +375,8 @@ trusty-kilo: openstack-origin: cloud:trusty-kilo source: "cloud:trusty-kilo" ceph-osd-replication-count: 2 + admin-role: admin + trusty-juno-nodes: inherits: openstack-phase1 @@ -391,5 +394,7 @@ trusty-juno: openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" ceph-osd-replication-count: 2 + admin-role: admin + |