commit 06ce729c5a3900491ea7b974da71c209e5c5c8d5 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Thu Nov 19 20:05:25 2020 +0100 Update playbooks playbooks/groups/bodhi-backend.yml | 9 +++++---- playbooks/groups/buildhw.yml | 2 +- playbooks/groups/osbs/deploy-cluster.yml | 18 ++++-------------- playbooks/groups/sign-bridge.yml | 4 ++-- 4 files changed, 12 insertions(+), 21 deletions(-) --- diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 1ef32ce..84524fa 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -1,6 +1,6 @@ -# create a new bodhi_backend system +# create a new bodhi-backend system # -# This group makes bodhi_backend servers. +# This group makes bodhi-backend servers. # They are used by releng to push updates with bodhi. # They also run some misc releng scripts. # @@ -9,8 +9,8 @@ # Once the instance exists, configure it. -- name: make bodhi_backend server system - hosts: bodhi_backend:bodhi_backend-stg +- name: make bodhi-backend server system + hosts: bodhi_backend:bodhi_backend_stg user: root gather_facts: True @@ -20,6 +20,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: + - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README - import_tasks: "{{ tasks_path }}/yumrepos.yml" roles: diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 5272d61..adcbfce 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/buildhw or from hostvars - name: make koji builder(s) on raw hw - hosts: builders + hosts: buildhw:bkernel remote_user: root gather_facts: True diff --git a/playbooks/groups/osbs/deploy-cluster.yml b/playbooks/groups/osbs/deploy-cluster.yml index 8464a60..fe3e8b6 100644 --- a/playbooks/groups/osbs/deploy-cluster.yml +++ b/playbooks/groups/osbs/deploy-cluster.yml @@ -140,22 +140,10 @@ name: - tar - rsync - - dbus-python + - python3-dbus - NetworkManager - - libselinux-python - - python2-pyyaml - when: env == "staging" - - name: Install necessary packages that openshift-ansible needs - package: - state: installed - name: - - tar - - rsync - - dbus-python - - NetworkManager - - libselinux-python + - python3-libselinux - python3-PyYAML - when: env == "production" - name: Deploy controller public ssh keys to osbs cluster hosts authorized_key: @@ -234,6 +222,7 @@ openshift_master_public_api_url: "https://{{ osbs_url }}:8443" openshift_release: "v3.11" openshift_version: "v3.11" + openshift_pkg_version: "-3.11*" openshift_ansible_path: "/root/openshift-ansible" openshift_ansible_pre_playbook: "playbooks/prerequisites.yml" openshift_ansible_playbook: "playbooks/deploy_cluster.yml" @@ -274,6 +263,7 @@ openshift_master_public_api_url: "https://{{ osbs_url }}:8443" openshift_release: "v3.11" openshift_version: "v3.11" + openshift_pkg_version: "-3.11.2" openshift_ansible_path: "/root/openshift-ansible" openshift_ansible_pre_playbook: "playbooks/prerequisites.yml" openshift_ansible_playbook: "playbooks/deploy_cluster.yml" diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index e1906fb..6da8a09 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -30,8 +30,8 @@ # owner_group: sigul - sigul/bridge - pre_tasks: - - import_tasks: "{{ tasks_path + pre_tasks: + - import_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - import_tasks: "{{ tasks_path }}/motd.yml"