From 34775089845b92c3f852afd668122df2c0407a05 Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Fri, 4 Dec 2015 09:52:09 +0800 Subject: put memcached installation first JIRA: COMPASS-178 Change-Id: I1b85ff33f6cd73875c2c10f526948a84b3350660 Signed-off-by: carey.xu --- deploy/adapters/ansible/roles/common/tasks/main.yml | 15 +++------------ deploy/adapters/ansible/roles/common/vars/Debian.yml | 6 ++++-- deploy/adapters/ansible/roles/common/vars/RedHat.yml | 4 ++-- deploy/adapters/ansible/roles/common/vars/main.yml | 4 +++- deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml | 1 - deploy/adapters/ansible/roles/dashboard/vars/main.yml | 4 +--- .../ansible/roles/keystone/templates/admin-openrc.sh | 1 + 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml index 3097d092..d4247ce5 100644 --- a/deploy/adapters/ansible/roles/common/tasks/main.yml +++ b/deploy/adapters/ansible/roles/common/tasks/main.yml @@ -21,11 +21,8 @@ echo "# compass" >> /etc/hosts echo {{ COMPASS_SERVER.stdout_lines[0] }} {{ name.stdout_lines[0] }} >> /etc/hosts -- name: first update pkgs - shell: "{{ ansible_pkg_mgr }} update" - - name: install packages - action: "{{ ansible_pkg_mgr }} name={{ item }} state=latest" + action: "{{ ansible_pkg_mgr }} name={{ item }} state=latest update_cache=yes" with_items: packages | union(packages_noarch) - name: make config template dir exist @@ -44,9 +41,6 @@ - name: update ntp conf template: src=ntp.conf dest=/etc/ntp.conf backup=yes -- name: stop ntp - service: name={{ ntp_service }} state=stopped enabled=yes - - name: use ntpdate once for initial sync time shell: ntpdate {{ ntp_server }} ignore_errors: True @@ -55,9 +49,6 @@ shell: hwclock --systohc ignore_errors: True -- name: restart ntp - service: name={{ ntp_service }} state=restarted enabled=yes - -- name: restart openvswitch +- name: restart services service: name={{ item }} state=restarted enabled=yes - with_items: services + with_items: services| union(services_noarch) diff --git a/deploy/adapters/ansible/roles/common/vars/Debian.yml b/deploy/adapters/ansible/roles/common/vars/Debian.yml index 8dce2729..5b159da7 100644 --- a/deploy/adapters/ansible/roles/common/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/common/vars/Debian.yml @@ -5,11 +5,13 @@ packages: - openvswitch-datapath-dkms - openvswitch-switch - crudini + - python-memcache pip_packages: [] pip_conf: pip.conf -services: [] +services: + - ntp + -ntp_service: ntp diff --git a/deploy/adapters/ansible/roles/common/vars/RedHat.yml b/deploy/adapters/ansible/roles/common/vars/RedHat.yml index 6618748f..e1f179ad 100644 --- a/deploy/adapters/ansible/roles/common/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/common/vars/RedHat.yml @@ -1,6 +1,7 @@ --- packages: - openvswitch + - python-memcached pip_packages: - crudini @@ -9,5 +10,4 @@ pip_conf: pip.conf services: - openvswitch - -ntp_service: ntpd + - ntpd diff --git a/deploy/adapters/ansible/roles/common/vars/main.yml b/deploy/adapters/ansible/roles/common/vars/main.yml index 2c5b5679..e3dfa496 100644 --- a/deploy/adapters/ansible/roles/common/vars/main.yml +++ b/deploy/adapters/ansible/roles/common/vars/main.yml @@ -2,5 +2,7 @@ packages_noarch: - python-pip - ntp + - memcached -services_noarch: [] +services_noarch: + - memcached diff --git a/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml b/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml index 5e84901c..481757bf 100644 --- a/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/dashboard/vars/RedHat.yml @@ -6,7 +6,6 @@ http_service: httpd packages: - mod_wsgi - - python-memcached services: [] diff --git a/deploy/adapters/ansible/roles/dashboard/vars/main.yml b/deploy/adapters/ansible/roles/dashboard/vars/main.yml index 39843a3e..fe9d5223 100644 --- a/deploy/adapters/ansible/roles/dashboard/vars/main.yml +++ b/deploy/adapters/ansible/roles/dashboard/vars/main.yml @@ -1,7 +1,5 @@ --- packages_noarch: - - memcached - openstack-dashboard -services_noarch: - - memcached +services_noarch: [] diff --git a/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh b/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh index 544fe31d..f54f4258 100644 --- a/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh +++ b/deploy/adapters/ansible/roles/keystone/templates/admin-openrc.sh @@ -3,4 +3,5 @@ export OS_PASSWORD={{ ADMIN_PASS }} export OS_TENANT_NAME=admin export OS_AUTH_URL=http://{{ internal_vip.ip }}:35357/v2.0 export OS_USERNAME=ADMIN +export OS_VOLUME_API_VERSION=2 -- cgit 1.2.3-korg