diff options
author | chigang <chigang@huawei.com> | 2017-06-30 20:24:25 +0800 |
---|---|---|
committer | chigang <chigang@huawei.com> | 2017-07-03 21:19:28 +0800 |
commit | 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a (patch) | |
tree | 1b012703eb52f78fe35119a4f9eba98b221f69d9 /deploy/adapters/ansible/roles/secgroup/tasks | |
parent | d529e77a45c77c10ac6970ca9e733e92e89d138f (diff) |
Remove obsoleted code
JIRA:-
use OpenStack-ansible deploy openstack, so remove obsoleted code.
Some of the enhanced features will be added in later versions
Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3
Signed-off-by: chigang <chigang@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/secgroup/tasks')
-rw-r--r-- | deploy/adapters/ansible/roles/secgroup/tasks/main.yml | 20 | ||||
-rw-r--r-- | deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml | 41 |
2 files changed, 0 insertions, 61 deletions
diff --git a/deploy/adapters/ansible/roles/secgroup/tasks/main.yml b/deploy/adapters/ansible/roles/secgroup/tasks/main.yml deleted file mode 100644 index 43a3f7f9..00000000 --- a/deploy/adapters/ansible/roles/secgroup/tasks/main.yml +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- include_vars: "{{ ansible_os_family }}.yml" - tags: secgroup - -- debug: msg={{ enable_secgroup }} - tags: secgroup - -- include: secgroup.yml - when: '{{ enable_secgroup }} == False' - tags: secgroup - -- meta: flush_handlers diff --git a/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml b/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml deleted file mode 100644 index 4efb13e9..00000000 --- a/deploy/adapters/ansible/roles/secgroup/tasks/secgroup.yml +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -- name: make sure template dir exits - file: path=/opt/os_templates state=directory mode=0755 - tags: secgroup - -- name: copy configs - 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" - tags: secgroup - with_subelements: - - "{{ 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" - tags: secgroup - with_subelements: - - "{{ configs_templates }}" - - dest - notify: restart compute relation service - when: inventory_hostname in "{{ groups['compute'] }}" |