diff --git a/playbooks/install-fmid.yml b/playbooks/install-fmid.yml index c095977c31..8ed10dfad7 100644 --- a/playbooks/install-fmid.yml +++ b/playbooks/install-fmid.yml @@ -1,5 +1,5 @@ --- -- name: Install Zowe SMPE FMID +- name: Install Zowe SMPE FMID. hosts: all gather_facts: false become: false @@ -78,14 +78,3 @@ - import_role: name: fmid tasks_from: overwrite_vars - - # ============================================================================ - # Configure Zowe - - import_role: - name: configfmid - - # ============================================================================ - # Start Zowe - - import_role: - name: start - when: not skip_start|default(False) diff --git a/playbooks/install-ptf.yml b/playbooks/install-ptf.yml index 8a969d9575..56054530b0 100644 --- a/playbooks/install-ptf.yml +++ b/playbooks/install-ptf.yml @@ -61,6 +61,11 @@ name: fmid tasks_from: overwrite_vars + # ============================================================================ + # Configure Zowe + - import_role: + name: configptf + # ============================================================================ # FIXME - name: Check if zowe_keystore_dir has a value diff --git a/playbooks/roles/configfmid/README.md b/playbooks/roles/configptf/README.md similarity index 100% rename from playbooks/roles/configfmid/README.md rename to playbooks/roles/configptf/README.md diff --git a/playbooks/roles/configfmid/defaults/main.yml b/playbooks/roles/configptf/defaults/main.yml similarity index 100% rename from playbooks/roles/configfmid/defaults/main.yml rename to playbooks/roles/configptf/defaults/main.yml diff --git a/playbooks/roles/configfmid/meta/main.yml b/playbooks/roles/configptf/meta/main.yml similarity index 100% rename from playbooks/roles/configfmid/meta/main.yml rename to playbooks/roles/configptf/meta/main.yml diff --git a/playbooks/roles/configfmid/tasks/configure_instance.yml b/playbooks/roles/configptf/tasks/configure_instance.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/configure_instance.yml rename to playbooks/roles/configptf/tasks/configure_instance.yml diff --git a/playbooks/roles/configfmid/tasks/create_security_defn.yml b/playbooks/roles/configptf/tasks/create_security_defn.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/create_security_defn.yml rename to playbooks/roles/configptf/tasks/create_security_defn.yml diff --git a/playbooks/roles/configfmid/tasks/install_proc.yml b/playbooks/roles/configptf/tasks/install_proc.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/install_proc.yml rename to playbooks/roles/configptf/tasks/install_proc.yml diff --git a/playbooks/roles/configfmid/tasks/install_xmem_server.yml b/playbooks/roles/configptf/tasks/install_xmem_server.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/install_xmem_server.yml rename to playbooks/roles/configptf/tasks/install_xmem_server.yml diff --git a/playbooks/roles/configfmid/tasks/main.yml b/playbooks/roles/configptf/tasks/main.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/main.yml rename to playbooks/roles/configptf/tasks/main.yml diff --git a/playbooks/roles/ptf/tasks/setup_certificates.yml b/playbooks/roles/configptf/tasks/setup_certificates.yml similarity index 100% rename from playbooks/roles/ptf/tasks/setup_certificates.yml rename to playbooks/roles/configptf/tasks/setup_certificates.yml diff --git a/playbooks/roles/configfmid/tasks/validate_configuration.yml b/playbooks/roles/configptf/tasks/validate_configuration.yml similarity index 100% rename from playbooks/roles/configfmid/tasks/validate_configuration.yml rename to playbooks/roles/configptf/tasks/validate_configuration.yml