Merge "Use 'package_facts' module in firewall role"
authorMichal Ptacek <m.ptacek@partner.samsung.com>
Mon, 4 Mar 2019 14:52:04 +0000 (14:52 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 4 Mar 2019 14:52:04 +0000 (14:52 +0000)
1  2 
ansible/infrastructure.yml

@@@ -1,11 -1,29 +1,9 @@@
  ---
  - name: Perform common environment setup for nodes
 -  hosts: infrastructure, kubernetes
 -  tasks:
 -    - name: Setup resolv.conf
 -      lineinfile:
 -        line: "nameserver {{ hostvars[groups.infrastructure[0]].cluster_ip }}"
 -        path: /etc/resolv.conf
 -        state: present
 -        insertbefore: BOF
 -      become: yes
 -    - name: Add application offline rpm repository
 -      yum_repository:
 -        name: "{{ app_name }}"
 -        file: "{{ app_name | lower }}"
 -        description: "{{ app_name }} offline repository"
 -        baseurl: "{{ 'http://repo.infra-server/rhel' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rhel' }}"
 -        gpgcheck: no
 -        enabled: yes
 -      when: deploy_rpm_repository
 -      become: yes
 -
 -- name: Setup firewall
    hosts: infrastructure, kubernetes
    roles:
 +    - package-repository
      - role: firewall
-       vars:
-         state: disable
  
  - name: Setup infrastructure servers
    hosts: infrastructure