From: Michal Ptacek <m.ptacek@partner.samsung.com>
Date: Mon, 4 Mar 2019 14:52:04 +0000 (+0000)
Subject: Merge "Use 'package_facts' module in firewall role"
X-Git-Tag: 6.0.0-ONAP~298
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=69ef231fec01c705f81c9ddae5240090d5710a44;p=oom%2Foffline-installer.git

Merge "Use 'package_facts' module in firewall role"
---

69ef231fec01c705f81c9ddae5240090d5710a44
diff --cc ansible/infrastructure.yml
index 89d63e89,a0bc7011..7d75dc77
--- a/ansible/infrastructure.yml
+++ b/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