From 53916ab0e407f29b33a72c721f424284567636ce Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Mon, 23 Jan 2017 15:38:52 +0800
Subject: 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>
---
 .../ansible/roles/congress/vars/Debian.yml         |  9 +++------
 .../ansible/roles/congress/vars/RedHat.yml         | 18 ++++++++++++++++++
 .../adapters/ansible/roles/congress/vars/main.yml  | 22 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 deploy/adapters/ansible/roles/congress/vars/Debian.yml
 create mode 100755 deploy/adapters/ansible/roles/congress/vars/RedHat.yml
 mode change 100644 => 100755 deploy/adapters/ansible/roles/congress/vars/main.yml

(limited to 'deploy/adapters/ansible/roles/congress/vars')

diff --git a/deploy/adapters/ansible/roles/congress/vars/Debian.yml b/deploy/adapters/ansible/roles/congress/vars/Debian.yml
old mode 100644
new mode 100755
index 36aba73e..1f0820c8
--- a/deploy/adapters/ansible/roles/congress/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/congress/vars/Debian.yml
@@ -7,15 +7,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-packages:
+pip_packages:
   - congress
   - python-congressclient
   - python-cloudfoundryclient
 
-service:
+services:
   - congress
 
-credentials:
-  - user: congress
-    db: congress
-    password: "{{ CONGRESS_DBPASS }}"
+congress_path: /usr/local/bin
diff --git a/deploy/adapters/ansible/roles/congress/vars/RedHat.yml b/deploy/adapters/ansible/roles/congress/vars/RedHat.yml
new file mode 100755
index 00000000..0b5e9678
--- /dev/null
+++ b/deploy/adapters/ansible/roles/congress/vars/RedHat.yml
@@ -0,0 +1,18 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+pip_packages:
+  - congress
+  - python-congressclient
+  - python-cloudfoundryclient
+
+services:
+  - congress
+
+congress_path: /usr/bin
diff --git a/deploy/adapters/ansible/roles/congress/vars/main.yml b/deploy/adapters/ansible/roles/congress/vars/main.yml
old mode 100644
new mode 100755
index f6fef749..18c4c845
--- a/deploy/adapters/ansible/roles/congress/vars/main.yml
+++ b/deploy/adapters/ansible/roles/congress/vars/main.yml
@@ -10,3 +10,25 @@
 packages_noarch: []
 
 services_noarch: []
+
+congress_service:
+  - name: congress
+    type: policy
+    region: RegionOne
+    description: "OpenStack Policy Service"
+    publicurl: "http://{{ public_vip.ip }}:1789"
+    internalurl: "http://{{ internal_vip.ip }}:1789"
+    adminurl: "http://{{ internal_vip.ip }}:1789"
+
+congress_user:
+  - user: congress
+    password: "{{ CONGRESS_PASS }}"
+    email: congress@admin.com
+    role: admin
+    tenant: service
+    tenant_description: "Service Tenant"
+
+congress_database:
+  - user: congress
+    db: congress
+    password: "{{ CONGRESS_DBPASS }}"
-- 
cgit 1.2.3-korg