From 7173757a6190f4528d36053d82467c74dbf16b3f Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Wed, 18 Jan 2017 18:05:27 +0800
Subject: Ansible Module substitute for Shell Commands

JIRA: COMPASS-520

After update ansible version to v3, keystone_user module only support v2 API.
So we use Shell Commands now, but it will failed with high probability.
Those Shell Commands should be instead by ansible modules to manage Identity users,
projects or some other work like crate networks.

Change-Id: I63d38b4a811a9c063ac4404da72787f594411b53
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../ansible/roles/heat/tasks/heat_install.yml      | 38 ++++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'deploy/adapters/ansible/roles/heat/tasks/heat_install.yml')

diff --git a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml b/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml
index fd0f6eaa..2803a3e6 100644
--- a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml
+++ b/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml
@@ -17,16 +17,34 @@
   lineinfile: dest=/opt/service create=yes line='{{ item }}'
   with_items: "{{ services | union(services_noarch) }}"
 
-- name: create heat user domain
-  shell: |
-    . /opt/admin-openrc.sh;
-    openstack domain create --description "Stack projects and users" heat;
-    openstack user create --domain heat --password {{ HEAT_PASS }} \
-        heat_domain_admin;
-    openstack role add --domain heat --user-domain heat \
-        --user heat_domain_admin admin;
-    openstack role create heat_stack_owner;
-    openstack role add --project demo --user demo heat_stack_owner;
+- name: create heat domain
+  os_keystone_domain:
+    cloud: opnfv
+    name: heat
+    state: present
+    description: "Stack projects and users"
+  when: inventory_hostname == groups['controller'][0]
+
+- name: create heat user
+  os_user:
+    cloud: opnfv
+    domain: heat
+    name: heat_domain_user
+    password: "{{ HEAT_PASS }}"
+  when: inventory_hostname == groups['controller'][0]
+
+- name: create heat role
+  os_keystone_role:
+    cloud: opnfv
+    name: heat_stack_owner
+  when: inventory_hostname == groups['controller'][0]
+
+- name: grant heat role
+  os_user_role:
+    cloud: opnfv
+    user: demo
+    project: demo
+    role: heat_stack_owner
   when: inventory_hostname == groups['controller'][0]
 
 - name: update heat conf
-- 
cgit 1.2.3-korg