From 0d4fc38c569df7a417065fd3094c7477660eb18c Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Thu, 20 Oct 2016 10:41:59 +0800
Subject: Edit the docker file and adjust HA yml

JIRA: COMPASS-491

Change-Id: Ibca46dca0ca614b9a6e7eb3fe5b9d5c8ca26c006
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../roles/keystone/tasks/keystone_install.yml                     | 8 ++++----
 .../openstack_newton_xenial/roles/keystone/vars/Debian.yml        | 2 +-
 .../ansible/openstack_newton_xenial/roles/keystone/vars/main.yml  | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles/keystone')

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml
index 79d02729..8ff087ce 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/tasks/keystone_install.yml
@@ -66,7 +66,7 @@
 - name: update apache2 configs
   template:
     src: wsgi-keystone.conf.j2
-    dest: '{{ apache_config_dir }}/sites-available/wsgi-keystone.conf'
+    dest: '{{ apache_config_dir }}/sites-available/keystone.conf'
   when: ansible_os_family == 'Debian'
   notify:
     - restart keystone services
@@ -74,15 +74,15 @@
 - name: update apache2 configs
   template:
     src: wsgi-keystone.conf.j2
-    dest: '{{ apache_config_dir }}/wsgi-keystone.conf'
+    dest: '{{ apache_config_dir }}/keystone.conf'
   when: ansible_os_family == 'RedHat'
   notify:
     - restart keystone services
 
 - name: enable keystone server
   file:
-    src: "{{ apache_config_dir }}/sites-available/wsgi-keystone.conf"
-    dest: "{{ apache_config_dir }}/sites-enabled/wsgi-keystone.conf"
+    src: "{{ apache_config_dir }}/sites-available/keystone.conf"
+    dest: "{{ apache_config_dir }}/sites-enabled/keystone.conf"
     state: "link"
   when: ansible_os_family == 'Debian'
   notify:
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/Debian.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/Debian.yml
index 6000c6fd..89bfbe0a 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/Debian.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/Debian.yml
@@ -11,11 +11,11 @@
 cron_path: "/var/spool/cron/crontabs"
 
 packages:
-  - keystone
   - apache2
   - libapache2-mod-wsgi
   - python-keystone
   - python-openstackclient
+  - keystone
 
 services:
   - apache2
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/main.yml
index ac548a09..79ed06fe 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/vars/main.yml
@@ -9,6 +9,7 @@
 ---
 packages_noarch:
   - python-keystoneclient
+  - python3-keystoneclient
 
 services_noarch: []
 os_services:
-- 
cgit 1.2.3-korg