diff options
| author | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-08-24 11:03:07 +0200 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-08-24 11:03:07 +0200 |
| commit | 7be1f76a53518dd48092a996841971eb4fd43f27 (patch) | |
| tree | 5f5e0fad7669a1b21f9eb1357d2110a52c1b74ae | |
| parent | 81d772c9c4ef58f742968147f7be725c5690fb83 (diff) | |
| download | openshift-7be1f76a53518dd48092a996841971eb4fd43f27.tar.gz openshift-7be1f76a53518dd48092a996841971eb4fd43f27.tar.bz2 openshift-7be1f76a53518dd48092a996841971eb4fd43f27.tar.xz openshift-7be1f76a53518dd48092a996841971eb4fd43f27.zip | |
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>
| -rw-r--r-- | playbooks/provisioning/openstack/post-provision-openstack.yml | 6 | ||||
| -rw-r--r-- | playbooks/provisioning/openstack/pre-install.yml | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/playbooks/provisioning/openstack/post-provision-openstack.yml b/playbooks/provisioning/openstack/post-provision-openstack.yml index f683b77be..28f3e5fcf 100644 --- a/playbooks/provisioning/openstack/post-provision-openstack.yml +++ b/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 diff --git a/playbooks/provisioning/openstack/pre-install.yml b/playbooks/provisioning/openstack/pre-install.yml index 629182d49..9b49136da 100644 --- a/playbooks/provisioning/openstack/pre-install.yml +++ b/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 |