From 6ee4647b4d2ca8144dcfa8f9a249459a46f342e1 Mon Sep 17 00:00:00 2001 From: Miguel Alex Cantu Date: Wed, 24 May 2017 09:33:24 -0500 Subject: [PATCH] Remove ceilometer endpoint tasks, variables. The ceilometer endpoint(API) has been removed per https://review.openstack.org/#/c/437232/ Change-Id: I3ac523ff5e1c17e19b3f4dae1dec9f2e60d93dab --- tasks/ceilometer_service_setup.yml | 26 +---------------------- tests/os_ceilometer-gnocchi-overrides.yml | 6 ------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/tasks/ceilometer_service_setup.yml b/tasks/ceilometer_service_setup.yml index 659921a2..d3468948 100644 --- a/tasks/ceilometer_service_setup.yml +++ b/tasks/ceilometer_service_setup.yml @@ -62,28 +62,4 @@ when: not ceilometer_service_in_ldap | bool until: add_admin_role|success retries: 5 - delay: 10 - -# Create an endpoint -- name: Ensure ceilometer endpoint - keystone: - command: "ensure_endpoint" - endpoint: "{{ keystone_service_adminurl }}" - login_user: "{{ keystone_admin_user_name }}" - login_password: "{{ keystone_auth_admin_password }}" - login_project_name: "{{ keystone_admin_tenant_name }}" - region_name: "{{ ceilometer_service_region }}" - service_name: "{{ ceilometer_service_name }}" - service_type: "{{ ceilometer_service_type }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - endpoint_list: - - url: "{{ ceilometer_service_publicurl }}" - interface: "public" - - url: "{{ ceilometer_service_adminurl }}" - interface: "admin" - - url: "{{ ceilometer_service_internalurl }}" - interface: "internal" - register: add_service - until: add_service|success - retries: 5 - delay: 10 + delay: 10 \ No newline at end of file diff --git a/tests/os_ceilometer-gnocchi-overrides.yml b/tests/os_ceilometer-gnocchi-overrides.yml index 7b094963..a7f20543 100644 --- a/tests/os_ceilometer-gnocchi-overrides.yml +++ b/tests/os_ceilometer-gnocchi-overrides.yml @@ -13,12 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -ceilometer_service_publicuri: "http://{{ hostvars[groups['ceilometer_all'][0]]['ansible_host'] }}:8777" -ceilometer_service_publicurl: "{{ ceilometer_service_publicuri }}" -ceilometer_service_internaluri: "http://{{ hostvars[groups['ceilometer_all'][0]]['ansible_host'] }}:8777" -ceilometer_service_internalurl: "{{ ceilometer_service_internaluri }}" -ceilometer_service_adminuri: "http://{{ hostvars[groups['ceilometer_all'][0]]['ansible_host'] }}:8777" -ceilometer_service_adminurl: "{{ ceilometer_service_adminuri }}" ceilometer_rabbitmq_userid: ceilometer ceilometer_rabbitmq_password: "{{ rabbitmq_password }}" ceilometer_rabbitmq_vhost: /ceilometer