From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- deploy/adapters/ansible/roles/heat/tasks/heat_install.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 a6e76c74..6a0f1c73 100644 --- a/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml +++ b/deploy/adapters/ansible/roles/heat/tasks/heat_install.yml @@ -21,13 +21,13 @@ - name: create heat user domain shell: > - . /opt/admin-openrc-v3.sh; + . /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; - when: inventory_hostname == groups['controller'][0] and ansible_os_family == "Debian" + when: inventory_hostname == groups['controller'][0] - name: update heat conf template: src=heat.j2 @@ -36,13 +36,4 @@ notify: - restart heat service - remove heat-sqlite-db - when: ansible_os_family == "RedHat" -- name: update heat conf - template: src=heat_debian.j2 - dest=/etc/heat/heat.conf - backup=yes - notify: - - restart heat service - - remove heat-sqlite-db - when: ansible_os_family == "Debian" -- cgit 1.2.3-korg