Deprecate support for workflow_tasks in Ceph services.

With the migration to external_deploy_tasks, we can remove support
for workflow_tasks in the Ceph services.

Change-Id: Ib7851e02424d4adb1490e8ed36327dc4a573c44f

docker/services/ceph-ansible/ceph-base.yaml

@@ -47,18 +47,10 @@ parameters:
     type: comma_delimited_list
     description: >
       List of server hostnames to blacklist from any triggered deployments.
-  CephAnsibleWorkflowName:
-    type: string
-    description: Name of the Mistral workflow to execute
-    default: tripleo.storage.v1.ceph-install
   CephAnsiblePlaybook:
     type: comma_delimited_list
     description: List of paths to the ceph-ansible playbooks to execute
     default: ['/usr/share/ceph-ansible/site-docker.yml.sample']
-  CephAnsibleUpgradePlaybook:
-    type: string
-    description: Path to the ceph-ansible playbook to execute on upgrade
-    default: /usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml
   CephAnsibleExtraConfig:
     type: json
     description: Extra vars for the ceph-ansible playbook
@@ -334,26 +326,7 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks:
-        step2:
-          - name: ceph_base_ansible_workflow
-            workflow: {get_param: CephAnsibleWorkflowName}
-            input:
-              ansible_skip_tags: {get_param: CephAnsibleSkipTags}
-              ceph_ansible_extra_vars: {get_param: CephAnsibleExtraConfig}
-              ceph_ansible_playbook:
-                if:
-                  - perform_upgrade
-                  - {get_param: CephAnsibleUpgradePlaybook}
-                  - {get_param: CephAnsiblePlaybook}
-              ansible_playbook_verbosity: {get_param: CephAnsiblePlaybookVerbosity}
-              node_data_lookup: {get_param: NodeDataLookup}
-              ansible_env_variables: {get_param: CephAnsibleEnvironmentVariables}
-      config_settings:
-        ceph_common_ansible_vars:
-          map_merge:
-            - ireallymeanit: 'yes'
-            - {get_attr: [CephBaseAnsibleVars, value, vars]}
+      config_settings: {}
       external_deploy_tasks:
         - name: ceph_base_external_deploy_init
           when: step == '1'

docker/services/ceph-ansible/ceph-client.yaml

@@ -60,7 +60,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}

docker/services/ceph-ansible/ceph-external.yaml

@@ -58,19 +58,14 @@ outputs:
   role_data:
     description: Role data for the Ceph External service.
     value:
-      service_name: ceph_external
+      service_name: ceph_client
       upgrade_tasks: []
       puppet_config:
         config_image: ''
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
-      config_settings:
-        ceph_client_ansible_vars:
-          map_merge:
-          - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-          - external_cluster_mon_ips: {get_param: CephExternalMonHost}
+      config_settings: {}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}

docker/services/ceph-ansible/ceph-mds.yaml

@@ -86,7 +86,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}
@@ -106,12 +105,4 @@ outputs:
             '112 ceph_mds':
               dport:
               - '6800-7300'
-        - ceph_mds_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - cephfs_data: {get_param: ManilaCephFSDataPoolName}
-              cephfs_metadata: {get_param: ManilaCephFSMetadataPoolName}
-              cephfs: {get_param: ManilaCephFSNativeShareBackendName}
-              cephfs_pools:
-              - { name: {get_param: ManilaCephFSDataPoolName}, pgs: {get_param: ManilaCephFSDataPoolPGNum} }
-              - { name: {get_param: ManilaCephFSMetadataPoolName}, pgs: {get_param: ManilaCephFSMetadataPoolPGNum} }
+        - {}

docker/services/ceph-ansible/ceph-mgr.yaml

@@ -61,7 +61,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}
@@ -81,7 +80,4 @@ outputs:
             '113 ceph_mgr':
               dport:
               - '6800-7300'
-        - ceph_mgr_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - ceph_mgr_docker_extra_env: '-e MGR_DASHBOARD=0'
+        - {}

docker/services/ceph-ansible/ceph-mon.yaml

@@ -79,7 +79,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}
@@ -99,8 +98,4 @@ outputs:
             '110 ceph_mon':
               dport:
               - 6789
-        - ceph_mon_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - monitor_secret: {get_param: CephMonKey}
-              admin_secret: {get_param: CephAdminKey}
+        - {}

docker/services/ceph-ansible/ceph-osd.yaml

@@ -75,7 +75,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}
@@ -95,8 +94,4 @@ outputs:
             '111 ceph_osd':
               dport:
               - '6800-7300'
-        - ceph_osd_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - osd_objectstore: filestore
-            - {get_param: CephAnsibleDisksConfig}
+        - {}

docker/services/ceph-ansible/ceph-rbdmirror.yaml

@@ -88,7 +88,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}
@@ -108,11 +107,4 @@ outputs:
             '114 ceph_rbdmirror':
               dport:
                 - '6800-7300'
-        - ceph_rbdmirror_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - copy_admin_key: {get_param: CephRbdMirrorCopyAdminKey}
-              ceph_rbd_mirror_configure: {get_param: CephRbdMirrorConfigure}
-              ceph_rbd_mirror_pool: {get_param: CephRbdMirrorPool}
-              ceph_rbd_mirror_remote_cluster: {get_param: CephRbdMirrorRemoteCluster}
-              ceph_rbd_mirror_remote_user: {get_param: CephRbdMirrorRemoteUser}
+        - {}

docker/services/ceph-ansible/ceph-rgw.yaml

@@ -72,7 +72,6 @@ outputs:
         config_volume: ''
         step_config: ''
       docker_config: {}
-      workflow_tasks: {get_attr: [CephBase, role_data, workflow_tasks]}
       external_deploy_tasks:
         list_concat:
         - {get_attr: [CephBase, role_data, external_deploy_tasks]}
@@ -91,13 +90,7 @@ outputs:
         - tripleo.ceph_rgw.firewall_rules:
             '122 ceph rgw':
               dport: {get_param: [EndpointMap, CephRgwInternal, port]}
-        - ceph_rgw_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - radosgw_keystone: true
-              radosgw_keystone_ssl: false
-              radosgw_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephRgwNetwork]}]}
-              radosgw_civetweb_port: {get_param: [EndpointMap, CephRgwInternal, port]}
+        - {}
       service_config_settings:
         keystone:
           ceph::rgw::keystone::auth::public_url: {get_param: [EndpointMap, CephRgwPublic, uri]}