summaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-01-23 15:38:52 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-02-04 14:39:32 +0800
commit53916ab0e407f29b33a72c721f424284567636ce (patch)
tree45c3574657ebecda7d34c707bab8ec61cd519408 /deploy/compass_conf
parentbf6f490bbac43392db6d0d3a5f27d4209b3967dc (diff)
Congress support for Newton
Modification: 1.Add congress support in deploy/compass_conf 2.Optimize congress role to be more independant. Separate congress role into install, keystone, database, start. 3.Support both ubuntu and centos Change-Id: I1c9a458addd84133652fb7c0563bc287d161d129 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/compass_conf')
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf4
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl4
2 files changed, 8 insertions, 0 deletions
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
index 9dcdfc5f..702f89cd 100755
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
+++ b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
@@ -54,6 +54,10 @@ CONFIG_MAPPING = {
"heat": {
"username": "heat",
"password": "heat"
+ },
+ "policy": {
+ "username": "congress",
+ "password": "congress"
}
}
}
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl
index 2205431b..b56a0b15 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl
@@ -115,6 +115,8 @@ ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
#set ceilometer_pass = $console_credentials.metering.password
#set aodh_dbpass = $credentials.alarming.password
#set aodh_pass = $console_credentials.alarming.password
+#set congress_dbpass = $credentials.policy.password
+#set congress_pass = $console_credentials.policy.password
#set admin_pass = $console_credentials.admin.password
#set demo_pass = $console_credentials.demo.password
@@ -153,6 +155,8 @@ NEUTRON_DBPASS: $neutron_dbpass
NEUTRON_PASS: $neutron_pass
HEAT_DBPASS: $heat_dbpass
HEAT_PASS: $heat_pass
+CONGRESS_DBPASS: $congress_dbpass
+CONGRESS_PASS: $congress_pass
DEMO_PASS: $demo_pass
ADMIN_PASS: $admin_pass