Browse Source

Do not repeat pre_tasks for post-provision playbook (#689)

Move repeating pre_tasks to pre-install
(OpenShift Pre-Requisites) step.

Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Bogdan Dobrelya 7 years ago
parent
commit
7be1f76a53

+ 0 - 6
playbooks/provisioning/openstack/post-provision-openstack.yml

@@ -25,8 +25,6 @@
   hosts: cluster_hosts
   gather_facts: False
   become: true
-  pre_tasks:
-    - include: pre_tasks.yml
   roles:
     - role: hostnames
 
@@ -50,8 +48,6 @@
   hosts: dns
   gather_facts: False
   become: true
-  pre_tasks:
-    - include: pre_tasks.yml
   roles:
     - role: dns-views
     - role: infra-ansible/roles/dns-server
@@ -60,8 +56,6 @@
   hosts: localhost
   gather_facts: True
   become: False
-  pre_tasks:
-    - include: pre_tasks.yml
   roles:
     - role: dns-records
     - role: infra-ansible/roles/dns

+ 5 - 0
playbooks/provisioning/openstack/pre-install.yml

@@ -12,3 +12,8 @@
     - { role: subscription-manager, when: hostvars.localhost.rhsm_register, tags: 'subscription-manager', ansible_sudo: true }
     - { role: docker, tags: 'docker' }
     - { role: openshift-prep, tags: 'openshift-prep' }
+
+- hosts: localhost:cluster_hosts
+  become: False
+  tasks:
+    - include: pre_tasks.yml