diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-22 16:59:08 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-12-26 17:54:43 +0800 |
| commit | 6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (patch) | |
| tree | a78a15b915741bb3ef7ddd4a61a801dd9f46d577 /deploy/adapters/ansible/roles/secgroup | |
| parent | a9041dbf7b68f56169e82de3c37601b7e86867b0 (diff) | |
Update ansible version
JIRA: COMPASS-511
Change-Id: Id0e83c65a08c9f9036b5d3a597b905e8a7bde6e8
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/secgroup')
| -rw-r--r-- | deploy/adapters/ansible/roles/secgroup/handlers/main.yml | 4 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/deploy/adapters/ansible/roles/secgroup/handlers/main.yml b/deploy/adapters/ansible/roles/secgroup/handlers/main.yml index e4e11ec7..77082ded 100644 --- a/deploy/adapters/ansible/roles/secgroup/handlers/main.yml +++ b/deploy/adapters/ansible/roles/secgroup/handlers/main.yml @@ -10,9 +10,9 @@ - name: restart controller relation service service: name={{ item }} state=restarted enabled=yes ignore_errors: True - with_items: controller_services + with_items: "{{ controller_services }}" - name: restart compute relation service service: name={{ item }} state=restarted enabled=yes ignore_errors: True - with_items: compute_services + with_items: "{{ compute_services }}" diff --git a/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml b/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml index 5e8684d4..9323facc 100644 --- a/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml +++ b/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml @@ -12,24 +12,27 @@ tags: secgroup - name: copy configs - template: src={{ item.src}} dest=/opt/os_templates - with_items: "{{ configs_templates }}" + template: src={{ item }} dest=/opt/os_templates + with_items: + - nova.j2 + - neutron.j2 tags: secgroup - name: update controller configs - shell: '[ -f {{ item.1 }} ] && crudini --merge {{ item.1 }} < /opt/os_templates/{{ item.0.src }} || /bin/true' + shell: "[ -f '{{ item.1 }}' ] && crudini --merge '{{ item.1 }}' < /opt/os_templates/{{ item.0.src }} || /bin/true" tags: secgroup with_subelements: - - configs_templates + - "{{ configs_templates }}" - dest notify: restart controller relation service when: inventory_hostname in "{{ groups['controller'] }}" - name: update compute configs - shell: '[ -f {{ item.1 }} ] && crudini --merge {{ item.1 }} < /opt/os_templates/{{ item.0.src }} || /bin/true' + shell: "[ -f '{{ item.1 }}' ] && crudini --merge '{{ item.1 }}' < /opt/os_templates/{{ item.0.src }} || /bin/true" tags: secgroup with_subelements: - - configs_templates + - "{{ configs_templates }}" - dest notify: restart compute relation service when: inventory_hostname in "{{ groups['compute'] }}" + |