diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index e12f771598..a402d547c1 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/ansible/roles/cinder/tasks/upgrade.yml @@ -10,13 +10,6 @@ - import_tasks: check-containers.yml -# TODO(bbezak): Remove this task in the Dalmatian cycle. -- import_role: - name: service-ks-register - vars: - service_ks_register_auth: "{{ openstack_cinder_auth }}" - service_ks_register_user_roles: "{{ cinder_ks_user_roles }}" - - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml index 8d8094b323..0e020b9df0 100644 --- a/ansible/roles/ironic/tasks/upgrade.yml +++ b/ansible/roles/ironic/tasks/upgrade.yml @@ -32,10 +32,3 @@ - include_tasks: legacy_upgrade.yml when: not ironic_enable_rolling_upgrade | bool - -# TODO(bbezak): Remove this task in the Dalmatian cycle. -- import_role: - name: service-ks-register - vars: - service_ks_register_auth: "{{ openstack_ironic_auth }}" - service_ks_register_user_roles: "{{ ironic_ks_user_roles }}" diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml index 787bc7773a..538b548b72 100644 --- a/ansible/roles/nova/tasks/upgrade.yml +++ b/ansible/roles/nova/tasks/upgrade.yml @@ -1,11 +1,4 @@ --- -# TODO(bbezak): Remove this task in the Dalmatian cycle. -- import_role: - name: service-ks-register - vars: - service_ks_register_auth: "{{ openstack_nova_auth }}" - service_ks_register_user_roles: "{{ nova_ks_user_roles }}" - # Create new set of configs on nodes - import_tasks: config.yml