From 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Tue, 27 Dec 2016 17:44:34 +0800 Subject: Yamllint test JIRA: COMPASS-516 Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef Signed-off-by: liyuenan --- deploy/adapters/ansible/roles/heat/handlers/main.yml | 1 - deploy/adapters/ansible/roles/heat/tasks/heat_config.yml | 1 - deploy/adapters/ansible/roles/heat/tasks/heat_install.yml | 9 +++++---- deploy/adapters/ansible/roles/heat/vars/Debian.yml | 1 - deploy/adapters/ansible/roles/heat/vars/RedHat.yml | 2 +- deploy/adapters/ansible/roles/heat/vars/main.yml | 1 - 6 files changed, 6 insertions(+), 9 deletions(-) (limited to 'deploy/adapters/ansible/roles/heat') diff --git a/deploy/adapters/ansible/roles/heat/handlers/main.yml b/deploy/adapters/ansible/roles/heat/handlers/main.yml index 77946a51..84bda2e3 100644 --- a/deploy/adapters/ansible/roles/heat/handlers/main.yml +++ b/deploy/adapters/ansible/roles/heat/handlers/main.yml @@ -13,4 +13,3 @@ - name: remove heat-sqlite-db shell: rm /var/lib/heat/heat.sqlite || touch heat.sqlite.db.removed - diff --git a/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml b/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml index 911a19ed..d0835860 100644 --- a/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml +++ b/deploy/adapters/ansible/roles/heat/tasks/heat_config.yml @@ -13,4 +13,3 @@ - restart heat service - meta: flush_handlers - diff --git a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml b/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml index 15334d40..fd0f6eaa 100644 --- a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml +++ b/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml @@ -18,11 +18,13 @@ with_items: "{{ services | union(services_noarch) }}" - name: create heat user domain - shell: > + 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 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; when: inventory_hostname == groups['controller'][0] @@ -34,4 +36,3 @@ notify: - restart heat service - remove heat-sqlite-db - diff --git a/deploy/adapters/ansible/roles/heat/vars/Debian.yml b/deploy/adapters/ansible/roles/heat/vars/Debian.yml index 64608ca1..4c978517 100644 --- a/deploy/adapters/ansible/roles/heat/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/heat/vars/Debian.yml @@ -17,4 +17,3 @@ services: - heat-api - heat-api-cfn - heat-engine - diff --git a/deploy/adapters/ansible/roles/heat/vars/RedHat.yml b/deploy/adapters/ansible/roles/heat/vars/RedHat.yml index 680b161f..435afd3f 100644 --- a/deploy/adapters/ansible/roles/heat/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/heat/vars/RedHat.yml @@ -12,7 +12,7 @@ services: - openstack-heat-api-cfn - openstack-heat-engine -packages: +packages: - openstack-heat-api - openstack-heat-api-cfn - openstack-heat-engine diff --git a/deploy/adapters/ansible/roles/heat/vars/main.yml b/deploy/adapters/ansible/roles/heat/vars/main.yml index 7f867d2a..f6fef749 100644 --- a/deploy/adapters/ansible/roles/heat/vars/main.yml +++ b/deploy/adapters/ansible/roles/heat/vars/main.yml @@ -10,4 +10,3 @@ packages_noarch: [] services_noarch: [] - -- cgit 1.2.3-korg