From: QiLiang <liangqi1@huawei.com>
Date: Sun, 28 Aug 2016 15:02:31 +0000 (+0800)
Subject: Disable keystone boot auto start
X-Git-Tag: colorado.1.0~13^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1db5dbcdb4b71541a554c6846546c7cf3b5e3137;p=compass4nfv.git

Disable keystone boot auto start

keystone is running under apache, disable keystone auto start
during system boot.

JIRA: COMPASS-475

Change-Id: Ia6c17dff71ae846ced12036da2e08bb7df4a4f2f
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit f79201043b88c9b71060c932063ca8e411ffdcbd)
---

diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml
index ea6926f4..ba4fc28e 100644
--- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/tasks/keystone_install.yml
@@ -26,6 +26,15 @@
     state=absent
   when: ansible_os_family == "Debian"
 
+- name: disable boot auto start
+  file:
+    path={{ item }}
+    state=absent
+  with_items:
+    - /etc/init.d/keystone
+    - /etc/init/keystone.conf
+  when: ansible_os_family == "Debian"
+
 - name: generate keystone service list
   lineinfile: dest=/opt/service create=yes line='{{ item }}'
   with_items: services | union(services_noarch)
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml
index ea6926f4..79d02729 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/tasks/keystone_install.yml
@@ -26,6 +26,16 @@
     state=absent
   when: ansible_os_family == "Debian"
 
+- name: disable boot auto start
+  file:
+    path={{ item }}
+    state=absent
+  with_items:
+    - /etc/init.d/keystone
+    - /etc/init/keystone.conf
+    - /lib/systemd/system/keystone.service
+  when: ansible_os_family == "Debian"
+
 - name: generate keystone service list
   lineinfile: dest=/opt/service create=yes line='{{ item }}'
   with_items: services | union(services_noarch)