From 192a4ee2d87c265f217cd4672f2f28983c5dccf5 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 12 Jan 2016 22:02:55 -0600 Subject: [PATCH] modified to add admin accross all deployment also adjust the unit for faster install. Change-Id: Ia280a428bed9eea6ae25944e787e616373ca93e6 (cherry picked from commit ff540418592ea894db5dfa41338be740dd8d485d) --- ci/nosdn/juju-deployer/ovs-ha.yaml | 18 +++++++++-------- ci/nosdn/juju-deployer/ovs-tip.yaml | 5 ++--- ci/nosdn/juju-deployer/ovs.yaml | 7 ++++--- ci/odl/juju-deployer/ovs-odl-ha.yaml | 18 ++++++++--------- ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 ++ ci/odl/juju-deployer/ovs-odl.yaml | 8 +++----- ci/onos/juju-deployer/onos-ha.yaml | 27 ++++++++++++------------- ci/onos/juju-deployer/onos-tip.yaml | 5 ++--- ci/onos/juju-deployer/onos.yaml | 8 +++----- ci/opencontrail/juju-deployer/contrail-ha.yaml | 26 ++++++++++++------------ ci/opencontrail/juju-deployer/contrail-tip.yaml | 6 +++--- ci/opencontrail/juju-deployer/contrail.yaml | 5 +++-- 12 files changed, 67 insertions(+), 68 deletions(-) diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 686f17b0..5b5845c5 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -58,6 +58,7 @@ openstack-phase2: num_units: 1 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - "lxc:nodes-api=0" cinder: @@ -68,8 +69,8 @@ openstack-phase2: glance-api-version: 2 ha-mcastport: 5401 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" cinder-ceph: charm: cs:trusty/cinder-ceph @@ -81,9 +82,9 @@ openstack-phase2: ha-mcastport: 5402 vip: 10.4.1.12 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" keystone: charm: cs:trusty/keystone num_units: 3 @@ -111,8 +112,8 @@ openstack-phase2: sst-password: 127rc14t51 vip: 10.4.1.15 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" neutron-api: charm: cs:trusty/neutron-api @@ -121,9 +122,9 @@ openstack-phase2: neutron-security-groups: true vip: 10.4.1.17 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" neutron-gateway: charm: cs:trusty/neutron-gateway num_units: 1 @@ -169,16 +170,16 @@ openstack-phase2: webroot: / vip: 10.4.1.11 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" rabbitmq-server: charm: cs:trusty/rabbitmq-server num_units: 3 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" heat: charm: cs:trusty/heat to: @@ -325,6 +326,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 2 admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -342,7 +344,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -360,5 +362,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index f3bfbdf6..25001c19 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -252,7 +252,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -272,6 +272,5 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index ea0906ce..46659686 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -53,6 +53,7 @@ openstack-phase2: num_units: 1 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - "lxc:nodes-api=0" cinder: @@ -259,7 +260,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -277,7 +278,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -295,5 +296,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index f1ed04b4..8800d8a0 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -31,8 +31,8 @@ openstack-phase2: "sst-password": 127rc14t51 vip: 10.4.1.15 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "hacluster-keystone": charm: "cs:trusty/hacluster" @@ -70,9 +70,9 @@ openstack-phase2: options: vip: 10.4.1.14 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "ceilometer-agent": branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" "mongodb": @@ -124,8 +124,8 @@ openstack-phase2: glance-api-version: 2 # ha-mcastport: 5401 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" cinder-ceph: charm: cs:trusty/cinder-ceph @@ -133,9 +133,9 @@ openstack-phase2: branch: lp:charms/trusty/rabbitmq-server num_units: 3 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "keystone": branch: lp:charms/trusty/keystone num_units: 3 @@ -156,8 +156,8 @@ openstack-phase2: vip: 10.4.1.11 webroot: / to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next @@ -181,9 +181,9 @@ openstack-phase2: "service-guard": true vip: 10.4.1.16 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "neutron-api": branch: lp:~openstack-charmers/charms/trusty/neutron-api/next num_units: 3 @@ -220,8 +220,8 @@ openstack-phase2: vip: 10.4.1.12 # ha-mcastport: 5402 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" neutron-api-odl: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp @@ -370,7 +370,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -389,5 +389,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 17726291..f79fb4ce 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -269,6 +269,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -288,4 +289,5 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin + keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index c122f763..f478cec9 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -266,7 +266,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -284,8 +284,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -303,6 +302,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml index a07ccc3c..802f8073 100644 --- a/ci/onos/juju-deployer/onos-ha.yaml +++ b/ci/onos/juju-deployer/onos-ha.yaml @@ -31,8 +31,8 @@ openstack-phase2: "sst-password": 127rc14t51 vip: 10.4.1.15 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "hacluster-keystone": charm: "cs:trusty/hacluster" @@ -70,9 +70,9 @@ openstack-phase2: options: vip: 10.4.1.14 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "ceilometer-agent": branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" "mongodb": @@ -111,9 +111,10 @@ openstack-phase2: num_units: 3 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" cinder: @@ -124,9 +125,9 @@ openstack-phase2: glance-api-version: 2 # ha-mcastport: 5401 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" cinder-ceph: charm: cs:trusty/cinder-ceph "rabbitmq-server": @@ -145,8 +146,8 @@ openstack-phase2: "admin-token": admin vip: 10.4.1.13 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "openstack-dashboard": branch: lp:charms/trusty/openstack-dashboard @@ -156,9 +157,9 @@ openstack-phase2: vip: 10.4.1.11 webroot: / to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next num_units: 2 @@ -181,8 +182,8 @@ openstack-phase2: "service-guard": true vip: 10.4.1.16 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "neutron-api": branch: lp:~openstack-charmers/charms/trusty/neutron-api/next @@ -192,9 +193,9 @@ openstack-phase2: manage-neutron-plugin-legacy-mode: False vip: 10.4.1.17 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" neutron-gateway: branch: "lp:~wuwenbin2/onosfw/neutron-gateway" options: @@ -214,9 +215,9 @@ openstack-phase2: vip: 10.4.1.12 # ha-mcastport: 5402 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" neutron-api-onos: branch: "lp:~wuwenbin2/onosfw/neutron-api-onos" options: @@ -345,7 +346,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -364,8 +365,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 2 admin-role: admin - - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -384,6 +384,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 2 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/onos/juju-deployer/onos-tip.yaml b/ci/onos/juju-deployer/onos-tip.yaml index bcfeeef1..35d56597 100644 --- a/ci/onos/juju-deployer/onos-tip.yaml +++ b/ci/onos/juju-deployer/onos-tip.yaml @@ -262,7 +262,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -282,6 +282,5 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/onos/juju-deployer/onos.yaml b/ci/onos/juju-deployer/onos.yaml index 506b516e..136e774b 100644 --- a/ci/onos/juju-deployer/onos.yaml +++ b/ci/onos/juju-deployer/onos.yaml @@ -260,7 +260,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -278,8 +278,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -297,6 +296,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 6cc86bf6..20545145 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -17,15 +17,15 @@ openstack-phase1: num_units: 3 series: precise to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" cassandra: branch: lp:~stub/charms/trusty/cassandra/noauthentication num_units: 3 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" options: authenticator: AllowAllAuthenticator @@ -48,9 +48,9 @@ openstack-phase2: "sst-password": 127rc14t51 vip: 10.4.1.15 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "hacluster-keystone": charm: "cs:trusty/hacluster" options: @@ -87,9 +87,9 @@ openstack-phase2: options: vip: 10.4.1.14 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "ceilometer-agent": branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" "mongodb": @@ -130,6 +130,7 @@ openstack-phase2: num_units: 1 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - "lxc:nodes-api=0" @@ -150,8 +151,8 @@ openstack-phase2: branch: lp:charms/trusty/rabbitmq-server num_units: 3 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "keystone": branch: lp:charms/trusty/keystone @@ -161,9 +162,9 @@ openstack-phase2: "admin-token": admin vip: 10.4.1.13 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "openstack-dashboard": branch: lp:charms/trusty/openstack-dashboard num_units: 3 @@ -197,8 +198,8 @@ openstack-phase2: "service-guard": true vip: 10.4.1.16 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "neutron-api": branch: lp:~openstack-charmers/charms/trusty/neutron-api/next @@ -208,17 +209,17 @@ openstack-phase2: manage-neutron-plugin-legacy-mode: False vip: 10.4.1.17 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "glance": branch: lp:charms/trusty/glance num_units: 3 options: vip: 10.4.1.12 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" relations: - [ "glance:ha", "hacluster-glance:ha" ] @@ -356,7 +357,7 @@ trusty-liberty: source: "cloud:trusty-liberty" ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -376,7 +377,7 @@ trusty-kilo: source: "cloud:trusty-kilo" ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -395,6 +396,5 @@ trusty-juno: source: "cloud:trusty-juno" ceph-osd-replication-count: 2 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index 0fa8f697..51ce5d10 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -253,7 +253,7 @@ trusty-liberty: source: "cloud:trusty-liberty" ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -278,8 +278,7 @@ trusty-kilo: source: "cloud:trusty-kilo" ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -303,4 +302,5 @@ trusty-juno: source: "cloud:trusty-juno" ceph-osd-replication-count: 1 admin-role: admin + keystone-admin-role: admin diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index b47580eb..503fb775 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -247,6 +247,7 @@ trusty-liberty: source: "cloud:trusty-liberty" ceph-osd-replication-count: 1 admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -271,7 +272,7 @@ trusty-kilo: source: "cloud:trusty-kilo" ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -295,5 +296,5 @@ trusty-juno: source: "cloud:trusty-juno" ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin -- 2.16.6