summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-10-27 17:29:39 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-11-07 14:35:46 +1100
commitb1e4629ae3e86c59503ac29a781a62a8e75c14f2 (patch)
tree58f6ff5f4ac2ad5dfc4409567eec6f6575c52b90 /playbooks
parent63fb0c74fcb0adf4cd3b0b2b5d30e34e29a58796 (diff)
downloadopenshift-b1e4629ae3e86c59503ac29a781a62a8e75c14f2.tar.gz
openshift-b1e4629ae3e86c59503ac29a781a62a8e75c14f2.tar.bz2
openshift-b1e4629ae3e86c59503ac29a781a62a8e75c14f2.tar.xz
openshift-b1e4629ae3e86c59503ac29a781a62a8e75c14f2.zip
Remove the openstack custom-actions for now
They're duplicating a lot of functionality that's already in openshift-ansible and they're not actually used from the provisioning playbooks. We'll revisit them later.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/openstack/custom-actions/add-cas.yml13
-rw-r--r--playbooks/openstack/custom-actions/add-docker-registry.yml90
-rw-r--r--playbooks/openstack/custom-actions/add-rhn-pools.yml13
-rw-r--r--playbooks/openstack/custom-actions/add-yum-repos.yml12
4 files changed, 0 insertions, 128 deletions
diff --git a/playbooks/openstack/custom-actions/add-cas.yml b/playbooks/openstack/custom-actions/add-cas.yml
deleted file mode 100644
index b2c195f91..000000000
--- a/playbooks/openstack/custom-actions/add-cas.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: cluster_hosts
- become: true
- vars:
- ca_files: []
- tasks:
- - name: Copy CAs to the trusted CAs location
- with_items: "{{ ca_files }}"
- copy:
- src: "{{ item }}"
- dest: /etc/pki/ca-trust/source/anchors/
- - name: Update trusted CAs
- shell: 'update-ca-trust enable && update-ca-trust extract'
diff --git a/playbooks/openstack/custom-actions/add-docker-registry.yml b/playbooks/openstack/custom-actions/add-docker-registry.yml
deleted file mode 100644
index e118a71dc..000000000
--- a/playbooks/openstack/custom-actions/add-docker-registry.yml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-- hosts: OSEv3
- become: true
- vars:
- registries: []
- insecure_registries: []
-
- tasks:
- - name: Check if docker is even installed
- command: docker
-
- - name: Install atomic-registries package
- yum:
- name: atomic-registries
- state: latest
-
- - name: Get registry configuration file
- register: file_result
- stat:
- path: /etc/containers/registries.conf
-
- - name: Check if it exists
- assert:
- that: 'file_result.stat.exists'
- msg: "Configuration file does not exist."
-
- - name: Load configuration file
- shell: cat /etc/containers/registries.conf
- register: file_content
-
- - name: Store file content into a variable
- set_fact:
- docker_conf: "{{ file_content.stdout | from_yaml }}"
-
- - name: Make sure that docker file content is a dictionary
- when: '(docker_conf is string) and (not docker_conf)'
- set_fact:
- docker_conf: {}
-
- - name: Make sure that registries is a list
- when: 'registries is string'
- set_fact:
- registries_list: [ "{{ registries }}" ]
-
- - name: Make sure that insecure_registries is a list
- when: 'insecure_registries is string'
- set_fact:
- insecure_registries_list: [ "{{ insecure_registries }}" ]
-
- - name: Set default values if there are no registries defined
- set_fact:
- docker_conf_registries: "{{ [] if docker_conf['registries'] is not defined else docker_conf['registries'] }}"
- docker_conf_insecure_registries: "{{ [] if docker_conf['insecure_registries'] is not defined else docker_conf['insecure_registries'] }}"
-
- - name: Add other registries
- when: 'registries_list is not defined'
- register: registries_merge_result
- set_fact:
- docker_conf: "{{ docker_conf | combine({'registries': (docker_conf_registries + registries) | unique}, recursive=True) }}"
-
- - name: Add other registries (if registries had to be converted)
- when: 'registries_merge_result|skipped'
- set_fact:
- docker_conf: "{{ docker_conf | combine({'registries': (docker_conf_registries + registries_list) | unique}, recursive=True) }}"
-
- - name: Add insecure registries
- when: 'insecure_registries_list is not defined'
- register: insecure_registries_merge_result
- set_fact:
- docker_conf: "{{ docker_conf | combine({'insecure_registries': (docker_conf_insecure_registries + insecure_registries) | unique }, recursive=True) }}"
-
- - name: Add insecure registries (if insecure_registries had to be converted)
- when: 'insecure_registries_merge_result|skipped'
- set_fact:
- docker_conf: "{{ docker_conf | combine({'insecure_registries': (docker_conf_insecure_registries + insecure_registries_list) | unique }, recursive=True) }}"
-
- - name: Load variable back to file
- copy:
- content: "{{ docker_conf | to_yaml }}"
- dest: /etc/containers/registries.conf
-
- - name: Restart registries service
- service:
- name: registries
- state: restarted
-
- - name: Restart docker
- service:
- name: docker
- state: restarted
diff --git a/playbooks/openstack/custom-actions/add-rhn-pools.yml b/playbooks/openstack/custom-actions/add-rhn-pools.yml
deleted file mode 100644
index d17c1e335..000000000
--- a/playbooks/openstack/custom-actions/add-rhn-pools.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- hosts: cluster_hosts
- vars:
- rhn_pools: []
- tasks:
- - name: Attach additional RHN pools
- become: true
- with_items: "{{ rhn_pools }}"
- command: "/usr/bin/subscription-manager attach --pool={{ item }}"
- register: attach_rhn_pools_result
- until: attach_rhn_pools_result.rc == 0
- retries: 10
- delay: 1
diff --git a/playbooks/openstack/custom-actions/add-yum-repos.yml b/playbooks/openstack/custom-actions/add-yum-repos.yml
deleted file mode 100644
index ffebcb642..000000000
--- a/playbooks/openstack/custom-actions/add-yum-repos.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- hosts: cluster_hosts
- vars:
- yum_repos: []
- tasks:
- # enable additional yum repos
- - name: Add repository
- yum_repository:
- name: "{{ item.name }}"
- description: "{{ item.description }}"
- baseurl: "{{ item.baseurl }}"
- with_items: "{{ yum_repos }}"