diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2015-12-04 09:52:09 +0800 |
|---|---|---|
| committer | carey.xu <carey.xuhan@huawei.com> | 2015-12-04 13:16:03 +0800 |
| commit | 34775089845b92c3f852afd668122df2c0407a05 (patch) | |
| tree | e00b5c9bf5e3a3b1f3fb46d9b6c5049fc47c2730 /deploy/adapters/ansible/roles/common | |
| parent | 5de09de80aac43e61ec411ad598e8cd915d9cadd (diff) | |
put memcached installation first
JIRA: COMPASS-178
Change-Id: I1b85ff33f6cd73875c2c10f526948a84b3350660
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/common')
4 files changed, 12 insertions, 17 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 |