From 006f333828db373435daa15483d2ab753048f62a Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Tue, 13 Mar 2018 05:01:30 +0100 Subject: Production --- playbooks/ands-network.yml | 19 +++++++++++++++++++ playbooks/ands-prepare.yml | 5 ----- playbooks/openshift-add-masters.yml | 3 ++- playbooks/openshift-add-nodes.yml | 3 ++- playbooks/x-os-update.yml | 9 +++++++++ 5 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 playbooks/ands-network.yml create mode 100644 playbooks/x-os-update.yml (limited to 'playbooks') diff --git a/playbooks/ands-network.yml b/playbooks/ands-network.yml new file mode 100644 index 0000000..1788781 --- /dev/null +++ b/playbooks/ands-network.yml @@ -0,0 +1,19 @@ +- name: Determin Ands facts + hosts: ands + roles: + - role: ands_facts + +- name: Prepare virtual hosts + hosts: virtual + roles: + - role: ands_vagrant_vmconf + +- name: Configure ininiband infrastrcture + hosts: baremetal + roles: + - role: ofed + +- name: Network configuration + hosts: ands + roles: + - { role: ands_network, action: nm_configure } diff --git a/playbooks/ands-prepare.yml b/playbooks/ands-prepare.yml index 239d292..4b204d2 100644 --- a/playbooks/ands-prepare.yml +++ b/playbooks/ands-prepare.yml @@ -3,11 +3,6 @@ roles: - role: ands_facts -- name: Prepare virtual hosts - hosts: virtual - roles: - - role: ands_vagrant_vmconf - - name: Common setup procedures hosts: ands roles: diff --git a/playbooks/openshift-add-masters.yml b/playbooks/openshift-add-masters.yml index 6878137..8c1672c 100644 --- a/playbooks/openshift-add-masters.yml +++ b/playbooks/openshift-add-masters.yml @@ -2,9 +2,10 @@ hosts: nodes:new_nodes roles: - { role: ands_facts } - - { role: ands_common, os_update: true } - { role: ands_network, action: install_pre } +- import_playbook: x-os-update.yml + # etcd will provisioned as well if node is listed in new_etcd - import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml - import_playbook: ../anslib/openshift-ansible/playbooks/openshift-master/scaleup.yml diff --git a/playbooks/openshift-add-nodes.yml b/playbooks/openshift-add-nodes.yml index 3d3efc4..6d3ace6 100644 --- a/playbooks/openshift-add-nodes.yml +++ b/playbooks/openshift-add-nodes.yml @@ -2,9 +2,10 @@ hosts: nodes:new_nodes roles: - { role: ands_facts } - - { role: ands_common, os_update: true } - { role: ands_network, action: install_pre } +- import_playbook: x-os-update.yml + # I am not sure if etcd will be automatic here. If not, we may need to run etcd scaleup afterwards # if node is also in new_etcd list - import_playbook: ../anslib/openshift-ansible/playbooks/prerequisites.yml diff --git a/playbooks/x-os-update.yml b/playbooks/x-os-update.yml new file mode 100644 index 0000000..b17ff20 --- /dev/null +++ b/playbooks/x-os-update.yml @@ -0,0 +1,9 @@ +- name: Configure cluster hosts names + hosts: nodes:new_nodes + roles: + - { role: ands_common, os_update: true } + +- name: Configure cluster hosts names + hosts: nodes:new_nodes + roles: + - { role: docker, action: install, update: true } -- cgit v1.2.3