From 276a5e919a8740b851763bc6c2a45b411b681bfb Mon Sep 17 00:00:00 2001 From: vass Date: Wed, 1 Apr 2020 19:04:35 +0200 Subject: [PATCH] Rename install-openshift to ensure-openshift for consistency The old role will be kept and include ensure-openshift for backwards-compatability. Change-Id: I6ff81fbd04f25207c87834b36e4d636eb9d44a93 --- doc/source/container-roles.rst | 1 + roles/ensure-openshift/README.rst | 16 +++++ .../defaults/main.yaml | 0 roles/ensure-openshift/tasks/main.yaml | 66 ++++++++++++++++++ roles/install-openshift/README.rst | 17 +---- roles/install-openshift/tasks/main.yaml | 69 +------------------ .../buildset-registry-openshift-docker.yaml | 2 +- zuul-tests.d/container-roles-jobs.yaml | 2 +- 8 files changed, 89 insertions(+), 84 deletions(-) create mode 100644 roles/ensure-openshift/README.rst rename roles/{install-openshift => ensure-openshift}/defaults/main.yaml (100%) create mode 100644 roles/ensure-openshift/tasks/main.yaml diff --git a/doc/source/container-roles.rst b/doc/source/container-roles.rst index 3a32e1773..32a9faa3e 100644 --- a/doc/source/container-roles.rst +++ b/doc/source/container-roles.rst @@ -7,6 +7,7 @@ Container Roles .. zuul:autorole:: deploy-openshift .. zuul:autorole:: ensure-docker .. zuul:autorole:: ensure-kubernetes +.. zuul:autorole:: ensure-openshift .. zuul:autorole:: install-docker .. zuul:autorole:: install-kubernetes .. zuul:autorole:: install-openshift diff --git a/roles/ensure-openshift/README.rst b/roles/ensure-openshift/README.rst new file mode 100644 index 000000000..758245c08 --- /dev/null +++ b/roles/ensure-openshift/README.rst @@ -0,0 +1,16 @@ +Setup openshift requirements and pull the container images. +The deploy-openshift role can be used to start the services. + +This role only works on CentOS. + +**Role Variables** + +.. zuul:rolevar:: origin_repo + :default: centos-release-openshift-origin39 + + The origin repository. + +.. zuul:rolevar:: origin_version + :default: v3.9.0 + + The origin version. diff --git a/roles/install-openshift/defaults/main.yaml b/roles/ensure-openshift/defaults/main.yaml similarity index 100% rename from roles/install-openshift/defaults/main.yaml rename to roles/ensure-openshift/defaults/main.yaml diff --git a/roles/ensure-openshift/tasks/main.yaml b/roles/ensure-openshift/tasks/main.yaml new file mode 100644 index 000000000..a36d229ee --- /dev/null +++ b/roles/ensure-openshift/tasks/main.yaml @@ -0,0 +1,66 @@ +- name: Install origin repository + yum: + name: "{{ origin_repo }}" + become: yes + +- name: Install requirements + yum: + name: "{{ item }}" + with_items: + - origin + - docker + become: yes + +- name: Fix docker start options + lineinfile: + dest: /etc/sysconfig/docker + regexp: "^OPTIONS=" + line: "OPTIONS='--selinux-enabled --log-driver=journald --signature-verification=false --insecure-registry 172.30.0.0/16'" + become: yes + +# See: https://github.com/openshift/origin/issues/15038 +- name: Fix rhel secret issue + file: + path: /usr/share/rhel/secrets + state: absent + become: yes + +- name: Ensure "docker" group exists + become: true + group: + name: docker + state: present + +- name: Add user to docker group + become: true + user: + name: "{{ ansible_user }}" + groups: + - docker + append: yes + +- name: Start docker service + service: + name: docker + state: started + become: yes + +- name: Pull origin images + command: "docker pull docker.io/openshift/{{ item }}:{{ origin_version }}" + with_items: + - origin-web-console + - origin-docker-registry + - origin-haproxy-router + - origin-deployer + - origin-pod + - origin + become: yes + +- name: Set group ownership of docker socket + become: true + file: + path: /var/run/docker.sock + group: docker + +- name: Reset ssh connection to pick up docker group + meta: reset_connection diff --git a/roles/install-openshift/README.rst b/roles/install-openshift/README.rst index 758245c08..7c35fec27 100644 --- a/roles/install-openshift/README.rst +++ b/roles/install-openshift/README.rst @@ -1,16 +1 @@ -Setup openshift requirements and pull the container images. -The deploy-openshift role can be used to start the services. - -This role only works on CentOS. - -**Role Variables** - -.. zuul:rolevar:: origin_repo - :default: centos-release-openshift-origin39 - - The origin repository. - -.. zuul:rolevar:: origin_version - :default: v3.9.0 - - The origin version. +.. warning:: Deprecated, use ensure-openshift instead. diff --git a/roles/install-openshift/tasks/main.yaml b/roles/install-openshift/tasks/main.yaml index a36d229ee..35a30063a 100644 --- a/roles/install-openshift/tasks/main.yaml +++ b/roles/install-openshift/tasks/main.yaml @@ -1,66 +1,3 @@ -- name: Install origin repository - yum: - name: "{{ origin_repo }}" - become: yes - -- name: Install requirements - yum: - name: "{{ item }}" - with_items: - - origin - - docker - become: yes - -- name: Fix docker start options - lineinfile: - dest: /etc/sysconfig/docker - regexp: "^OPTIONS=" - line: "OPTIONS='--selinux-enabled --log-driver=journald --signature-verification=false --insecure-registry 172.30.0.0/16'" - become: yes - -# See: https://github.com/openshift/origin/issues/15038 -- name: Fix rhel secret issue - file: - path: /usr/share/rhel/secrets - state: absent - become: yes - -- name: Ensure "docker" group exists - become: true - group: - name: docker - state: present - -- name: Add user to docker group - become: true - user: - name: "{{ ansible_user }}" - groups: - - docker - append: yes - -- name: Start docker service - service: - name: docker - state: started - become: yes - -- name: Pull origin images - command: "docker pull docker.io/openshift/{{ item }}:{{ origin_version }}" - with_items: - - origin-web-console - - origin-docker-registry - - origin-haproxy-router - - origin-deployer - - origin-pod - - origin - become: yes - -- name: Set group ownership of docker socket - become: true - file: - path: /var/run/docker.sock - group: docker - -- name: Reset ssh connection to pick up docker group - meta: reset_connection +- name: Include ensure-openshift + include_role: + name: ensure-openshift diff --git a/test-playbooks/registry/buildset-registry-openshift-docker.yaml b/test-playbooks/registry/buildset-registry-openshift-docker.yaml index dbb2d5fcd..348683e40 100644 --- a/test-playbooks/registry/buildset-registry-openshift-docker.yaml +++ b/test-playbooks/registry/buildset-registry-openshift-docker.yaml @@ -1,7 +1,7 @@ - hosts: all roles: - role: clear-firewall - - role: install-openshift + - role: ensure-openshift - role: use-buildset-registry buildset_registry_docker_user: root - role: deploy-openshift diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml index 98795329d..3ed4b8105 100644 --- a/zuul-tests.d/container-roles-jobs.yaml +++ b/zuul-tests.d/container-roles-jobs.yaml @@ -210,7 +210,7 @@ - roles/pull-from-intermediate-registry/.* - roles/push-to-intermediate-registry/.* - roles/ensure-docker/.* - - roles/install-openshift/.* + - roles/ensure-openshift/.* - roles/build-docker-image/.* - roles/run-buildset-registry/.* - roles/use-buildset-registry/.*