add-osds: followup on 3632b26

Three fixes:

- fix a typo in vagrant_variables that cause a networking issue for
containerized scenario.
- add containerized_deployment: true
- remove a useless block of code: the fact docker_exec_cmd is set in
ceph-defaults which is played right after.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

infrastructure-playbooks/add-osd.yml

@@ -45,20 +45,6 @@
     - ceph-defaults
     - ceph-validate
 
-- hosts: "{{ groups['mons'][0] }}"
-  gather_facts: False
-  become: True
-
-  roles:
-    - role: ceph-defaults
-    - role: ceph-fetch-keys
-
-  post_tasks:
-    - name: set_fact docker_exec_cmd if containerized_deployment
-      set_fact:
-        docker_exec_cmd: "docker exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }}"
-      when: containerized_deployment
-
 - hosts: osds
   gather_facts: False
   become: True

tests/functional/centos/7/add-osds-container/group_vars/all

@@ -1,6 +1,8 @@
 ---
+docker: True
 ceph_origin: repository
 ceph_repository: community
+containerized_deployment: true
 cluster: ceph
 public_network: "192.168.55.0/24"
 cluster_network: "192.168.56.0/24"

tests/functional/centos/7/add-osds-container/vagrant_variables.yml

@@ -22,7 +22,7 @@ restapi: true
 ceph_install_source: stable
 
 # SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.53
+public_subnet: 192.168.55
 cluster_subnet: 192.168.56
 
 # MEMORY