Remove unnecessary overrides of service variables

Use the existing neutron namespaced variables instead of overriding and
providing a generic 'service_' variable for use with the service setup
tasks. The existing neutron_service_setup.yml file can be directly
replaced by neutron_service_add.yml.

This also fixes a recursive loop issue seen when deploying the
integrated release with Ansible 2.1.

Change-Id: I715be2c77fa5639e28c9baeebe6552747f07bb30

tasks/neutron_service_add.yml

@@ -1,107 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Create a service
-- name: Ensure neutron service
-  keystone:
-    command: "ensure_service"
-    endpoint: "{{ keystone_service_adminurl }}"
-    login_user: "{{ keystone_admin_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
-    service_name: "{{ service_name }}"
-    service_type: "{{ service_type }}"
-    description: "{{ service_description }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  until: add_service|success
-  retries: 5
-  delay: 2
-  tags:
-    - neutron-api-setup
-    - neutron-service-add
-    - neutron-setup
-
-# Create an admin user
-- name: Ensure neutron user
-  keystone:
-    command: "ensure_user"
-    endpoint: "{{ keystone_service_adminurl }}"
-    login_user: "{{ keystone_admin_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
-    user_name: "{{ service_user_name }}"
-    tenant_name: "{{ service_tenant_name }}"
-    password: "{{ service_password }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  when: not neutron_service_in_ldap | bool
-  until: add_service|success
-  retries: 5
-  delay: 10
-  tags:
-    - neutron-api-setup
-    - neutron-service-add
-    - neutron-setup
-
-# Add a role to the user
-- name: Ensure neutron user to admin role
-  keystone:
-    command: "ensure_user_role"
-    endpoint: "{{ keystone_service_adminurl }}"
-    login_user: "{{ keystone_admin_user_name }}"
-    login_password: "{{ keystone_auth_admin_password }}"
-    login_project_name: "{{ keystone_admin_tenant_name }}"
-    user_name: "{{ service_user_name }}"
-    tenant_name: "{{ service_tenant_name }}"
-    role_name: "{{ neutron_service_role_name }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-  register: add_service
-  when: not neutron_service_in_ldap | bool
-  until: add_service|success
-  retries: 5
-  delay: 10
-  tags:
-    - neutron-api-setup
-    - neutron-service-add
-    - neutron-setup
-
-# Create an endpoint
-- name: Ensure neutron 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: "{{ service_region }}"
-    service_name: "{{ service_name }}"
-    service_type: "{{ service_type }}"
-    insecure: "{{ keystone_service_adminuri_insecure }}"
-    endpoint_list:
-      - url: "{{ service_publicurl }}"
-        interface: "public"
-      - url: "{{ service_internalurl }}"
-        interface: "internal"
-      - url: "{{ service_adminurl }}"
-        interface: "admin"
-  register: add_service
-  until: add_service|success
-  retries: 5
-  delay: 10
-  tags:
-    - neutron-api-setup
-    - neutron-service-add
-    - neutron-setup

tasks/neutron_service_setup.yml

@@ -13,17 +13,95 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: neutron_service_add.yml
-  vars:
-    service_user_name: "{{ neutron_service_user_name }}"
-    service_tenant_name: "{{ neutron_service_project_name }}"
+# Create a service
+- name: Ensure neutron service
+  keystone:
+    command: "ensure_service"
+    endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
     service_name: "{{ neutron_service_name }}"
     service_type: "{{ neutron_service_type }}"
-    service_region: "{{ neutron_service_region }}"
-    service_description: "{{ neutron_service_description }}"
-    service_password: "{{ neutron_service_password }}"
-    service_publicurl: "{{ neutron_service_publicurl }}"
-    service_internalurl: "{{ neutron_service_internalurl }}"
-    service_adminurl: "{{ neutron_service_adminurl }}"
+    description: "{{ neutron_service_description }}"
+    insecure: "{{ keystone_service_adminuri_insecure }}"
+  register: add_service
+  until: add_service|success
+  retries: 5
+  delay: 2
   tags:
-    - neutron-server
+    - neutron-api-setup
+    - neutron-service-add
+    - neutron-setup
+
+# Create an admin user
+- name: Ensure neutron user
+  keystone:
+    command: "ensure_user"
+    endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
+    user_name: "{{ neutron_service_user_name }}"
+    tenant_name: "{{ neutron_service_project_name }}"
+    password: "{{ neutron_service_password }}"
+    insecure: "{{ keystone_service_adminuri_insecure }}"
+  register: add_service
+  when: not neutron_service_in_ldap | bool
+  until: add_service|success
+  retries: 5
+  delay: 10
+  tags:
+    - neutron-api-setup
+    - neutron-service-add
+    - neutron-setup
+
+# Add a role to the user
+- name: Ensure neutron user to admin role
+  keystone:
+    command: "ensure_user_role"
+    endpoint: "{{ keystone_service_adminurl }}"
+    login_user: "{{ keystone_admin_user_name }}"
+    login_password: "{{ keystone_auth_admin_password }}"
+    login_project_name: "{{ keystone_admin_tenant_name }}"
+    user_name: "{{ neutron_service_user_name }}"
+    tenant_name: "{{ neutron_service_project_name }}"
+    role_name: "{{ neutron_service_role_name }}"
+    insecure: "{{ keystone_service_adminuri_insecure }}"
+  register: add_service
+  when: not neutron_service_in_ldap | bool
+  until: add_service|success
+  retries: 5
+  delay: 10
+  tags:
+    - neutron-api-setup
+    - neutron-service-add
+    - neutron-setup
+
+# Create an endpoint
+- name: Ensure neutron 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: "{{ neutron_service_region }}"
+    service_name: "{{ neutron_service_name }}"
+    service_type: "{{ neutron_service_type }}"
+    insecure: "{{ keystone_service_adminuri_insecure }}"
+    endpoint_list:
+      - url: "{{ neutron_service_publicurl }}"
+        interface: "public"
+      - url: "{{ neutron_service_internalurl }}"
+        interface: "internal"
+      - url: "{{ neutron_service_adminurl }}"
+        interface: "admin"
+  register: add_service
+  until: add_service|success
+  retries: 5
+  delay: 10
+  tags:
+    - neutron-api-setup
+    - neutron-service-add
+    - neutron-setup