Only run Ceph network_config_set during initial deployment

There is no reason to include the network_config_set tasks
file in the cephadm_config_set tasks which can be run both
before and during overcloud deployment. It is safer to only
run it during the initial Ceph deployment. The danger is that
the network_config_set tasks file from the tripleo_cephadm
role can misconfigure Ceph during overcloud deployment if
the Ceph deployment relied on an initial ceph.conf to
configure the Ceph networks.

Change-Id: I74e1197362517c3ad4bbdfc54adbf3ac934acf4b
Closes-Bug: #1980992
(cherry picked from commit 70bbaf6b81)

tripleo_ansible/playbooks/cli-deployed-ceph.yaml

@@ -184,6 +184,11 @@
         name: tripleo_cephadm
         tasks_from: bootstrap
 
+    - name: Configure public/private network and ms_bind ipv4/v6
+      import_role:
+        name: tripleo_cephadm
+        tasks_from: network_config_set
+
     - name: Apply Ceph spec
       import_role:
         name: tripleo_cephadm

tripleo_ansible/roles/tripleo_cephadm/tasks/cephadm_config_set.yaml

@@ -26,11 +26,6 @@
   become: true
   when: tripleo_cephadm_debug | bool
 
-- name: ceph config set public/private network and ms_bind ipv4/v6
-  include_tasks: network_config_set.yaml
-  when:
-    - tripleo_cephadm_deployed_ceph | default(false) | bool
-
 - name: set default container image in ceph configuration
   command: |
     {{ tripleo_cephadm_ceph_cli }} config set global container_image \

tripleo_ansible/roles/tripleo_cephadm/tasks/network_config_set.yaml

@@ -1,4 +1,9 @@
 ---
+- name: Ensure tripleo_cephadm_ceph_cli is set
+  include_tasks: ceph_cli.yaml
+  when:
+    - tripleo_cephadm_ceph_cli is not defined
+
 - name: Define list of keys to search for in initial ceph conf file
   set_fact:
     keys_in_ceph_conf: []