Remove unused centos docker tasks

The `enable extras on centos` task just doesn't work when using the
variable ceph_docker_enable_centos_extra_repo to true.

fatal: [xxx]; FAILED! => {"changed": false, "msg": "Parameter
'baseurl', 'metalink' or 'mirrorlist' is required."}

The CentOS extras repository is enabled by default so it's pretty
safe to remove this task and the associated variable.

This also removes the ceph_docker_on_openstack variable as it's a
leftover and it is unused.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/Vagrantfile b/Vagrantfile
index 1398c4c9f0c66202ae354c01a6ec6b1097189155..fe97f664daea30206d82d7af1a1f238e81703279 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -76,7 +76,6 @@ ansible_provision = proc do |ansible|
       monitor_interface: ETH,
       ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
       devices: settings['disks'],
-      ceph_docker_on_openstack: BOX == 'openstack',
       radosgw_interface: ETH,
       generate_fsid: 'true',
     })

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index ff30b724786c82cd912be8a56316a69a39664596..c5d33dc390fe6a3b69bc12f1b5e38c2323b73062 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -598,8 +598,6 @@ dummy:
 #ceph_client_docker_image: "{{ ceph_docker_image }}"
 #ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"
 #ceph_client_docker_registry: "{{ ceph_docker_registry }}"
-#ceph_docker_enable_centos_extra_repo: false
-#ceph_docker_on_openstack: false
 #containerized_deployment: False
 #container_binary:
 #timeout_command: "{{ 'timeout --foreground -s KILL ' ~ docker_pull_timeout if (docker_pull_timeout != '0') and (ceph_docker_dev_image is undefined or not ceph_docker_dev_image) else '' }}"

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index e742e356e3ac8fc44607be5aff0a7dbf31fe5750..83f1f8cd39a4ea03ddce1b1359439a7d52b6f39e 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -598,8 +598,6 @@ ceph_docker_registry_auth: true
 #ceph_client_docker_image: "{{ ceph_docker_image }}"
 #ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"
 #ceph_client_docker_registry: "{{ ceph_docker_registry }}"
-#ceph_docker_enable_centos_extra_repo: false
-#ceph_docker_on_openstack: false
 #containerized_deployment: False
 #container_binary:
 #timeout_command: "{{ 'timeout --foreground -s KILL ' ~ docker_pull_timeout if (docker_pull_timeout != '0') and (ceph_docker_dev_image is undefined or not ceph_docker_dev_image) else '' }}"

diff --git a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
index 5ed0127e7756ecd0ccadad263cfa823da7e6917e..b00ba464661a48a118a3bc5fcdd86cb93e25e8d4 100644 (file)
--- a/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
+++ b/roles/ceph-container-engine/tasks/pre_requisites/prerequisites.yml
@@ -11,18 +11,6 @@
     - ansible_os_family == 'Debian'
   tags: with_pkg
 
-# ensure extras enabled for docker
-- name: enable extras on centos
-  yum_repository:
-    name: extras
-    state: present
-    enabled: yes
-  when:
-    - ansible_distribution == 'CentOS'
-    - ceph_docker_enable_centos_extra_repo | bool
-  tags:
-    with_pkg
-
 - name: install container packages
   package:
     name: ['{{ container_package_name }}', '{{ container_binding_name }}']

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 647b1882aa2596484bceabed03169005c9f5457d..3caa65ef71e3e6c62387f94eb1816f227a78530f 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -590,8 +590,6 @@ ceph_docker_no_proxy: "localhost,127.0.0.1"
 ceph_client_docker_image: "{{ ceph_docker_image }}"
 ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"
 ceph_client_docker_registry: "{{ ceph_docker_registry }}"
-ceph_docker_enable_centos_extra_repo: false
-ceph_docker_on_openstack: false
 containerized_deployment: False
 container_binary:
 timeout_command: "{{ 'timeout --foreground -s KILL ' ~ docker_pull_timeout if (docker_pull_timeout != '0') and (ceph_docker_dev_image is undefined or not ceph_docker_dev_image) else '' }}"

diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml
index 3a8c82ae1114911f06fb3f27484125f6c20ccd9b..38a3c13356962a7ff04675342ddc637c2f065011 100644 (file)
--- a/roles/ceph-osd/tasks/start_osds.yml
+++ b/roles/ceph-osd/tasks/start_osds.yml
@@ -1,14 +1,4 @@
 ---
-- name: umount ceph disk (if on openstack)
-  mount:
-    name: /mnt
-    src: /dev/vdb
-    fstype: ext3
-    state: unmounted
-  when:
-    - ceph_docker_on_openstack | bool
-    - containerized_deployment | bool
-
 # this is for ceph-disk, the ceph-disk command is gone so we have to list /var/lib/ceph
 - name: get osd ids
   shell: |

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index 0a8a69350c575c9df0583efd12ca51ceb0b2869c..dafb610c51f67f25c9df9c62391f7d8b1e66ea98 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.19.0/24"
 cluster_network: "192.168.20.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/all-in-one/group_vars/all b/tests/functional/all-in-one/group_vars/all
index 71efbc41536a1061d857569c05a0aa2a7c3a5133..d0caa26c3a0b5cfd9b3fbcf8c2165b2c9f4eff21 100644 (file)
--- a/tests/functional/all-in-one/group_vars/all
+++ b/tests/functional/all-in-one/group_vars/all
@@ -5,7 +5,6 @@ ceph_repository: community
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 openstack_config: True
 dashboard_enabled: False
 public_network: "192.168.17.0/24"

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index f063fb53c997a171afb56b12c2c8e47744b592cc..d1fa0ddddba6564ba61d18f07c65a1f26f5717f0 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -7,7 +7,6 @@ containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.17.0/24"
 cluster_network: "192.168.18.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index 0d1395a506651655eaa03f02fc8cc908789be304..eb975d34e68e6916f515199ccaa8d67c7f21c126 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.15.0/24"
 cluster_network: "192.168.16.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 97237d4cfce25c6b8438eac83d669ae8a2b54957..e7a6e4ea385bc237c95312464277a43fc7fb7ac2 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -5,7 +5,6 @@ ceph_repository: community
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.15.0/24"
 cluster_network: "192.168.16.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 0c808852d452ef7c5a5dd5f0f191774ce7955442..0823257c504cf14612b0e1b075c1628cabb3859e 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -8,7 +8,6 @@ containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.58.0/24"
 cluster_network: "192.168.59.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index 21a6db39dbb2da5f57c7a5414a8bb036c0a1a6ef..8ff02aa512d4d74d49c4e50a973a03d43b0121fe 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -8,7 +8,6 @@ monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.31.0/24"
 cluster_network: "192.168.32.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/external_clients/inventory/group_vars/all b/tests/functional/external_clients/inventory/group_vars/all
index 3569d71dfd603e881702052d31622a003a8b2a73..81f37e7a60532a20ea846833e31099fc5ef98150 100644 (file)
--- a/tests/functional/external_clients/inventory/group_vars/all
+++ b/tests/functional/external_clients/inventory/group_vars/all
@@ -5,7 +5,6 @@ ceph_repository: community
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 openstack_config: True
 dashboard_enabled: False
 public_network: "192.168.31.0/24"

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 85106395a74f2420cbb1b8acc3c1aa1f4624da60..2fc925e3d2c5670a3e9e1ca44766b5cfd2306031 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -7,7 +7,6 @@ containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.30.0/24"
 cluster_network: "192.168.31.0/24"
 rgw_override_bucket_index_max_shards: 16

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 9c6bab1a64a05484b6d50775856acf105c8cff33..377b1da6f7fd88e2dbc621ad54a446a365bbf637 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -6,7 +6,6 @@ docker: True
 containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.79.0/24"
 cluster_network: "192.168.80.0/24"
 ceph_conf_overrides:

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index ed7a2b46330f4862f557467f608b5d539d6a9ebe..40f5fc67c102df81f61c3b66aaf5d37dba5e002a 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -6,7 +6,6 @@ docker: True
 containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.83.0/24"
 cluster_network: "192.168.84.0/24"
 ceph_conf_overrides:

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index f2286b568829a80b5370c1e62855568a41b38b00..2ed4f0339960f6be64d840b087337933cd962c9c 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -6,7 +6,6 @@ docker: True
 containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.17.0/24"
 cluster_network: "192.168.18.0/24"
 ceph_conf_overrides:

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index d0e8f9bb140c42494edae772d969447c9c02a455..f85a7cfc9479aa960a91be976bc10a82fb0f28cc 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -6,7 +6,6 @@ docker: True
 containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 public_network: "192.168.73.0/24"
 cluster_network: "192.168.74.0/24"
 ceph_conf_overrides:

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 255801fc7b8b9406bcd99b0af8d73fb414a022c4..d18228d30940b4a5db2a6039625eeb45dd9c045b 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -7,7 +7,6 @@ cluster_network: "192.168.88.0/24"
 containerized_deployment: True
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 ceph_conf_overrides:
   global:
     mon_allow_pool_size_one: true

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 7bbd68eead43e6e369960ca4c775952e3a40fbbc..3f5e185d3e7affcb1e3770565d4fbd9358ef9874 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -9,7 +9,6 @@ cluster_network: "192.168.92.0/24"
 monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
 ceph_conf_overrides:
   global:
     mon_allow_pool_size_one: true