From 3bd96fecbfa6abb1b591a74d5a4b89321a8328ff Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 12 Jul 2018 18:15:37 +0100 Subject: [PATCH] Execute service setup against a delegated host using Ansible built-in modules In order to reduce the packages required to pip install on to the hosts, we allow the service setup to be delegated to a specific host, defaulting to the deploy host. We also switch as many tasks as possible to using the built-in Ansible modules which make use of the shade library. The 'virtualenv' package is now installed appropriately by the openstack_hosts role, so there's no need to install it any more. The 'httplib2' package is a legacy Ansible requirement for the get_url/get_uri module which is no longer needed. The keystone client library is not required any more now that we're using the upstream modules. As there are no required packages left, the task to install them is also removed. Change-Id: I2e33c4cb468e93259860b600719d87c4022d6805 --- defaults/main.yml | 10 ++ meta/main.yml | 2 - ...n-service-setup-host-895ececec99d7a51.yaml | 17 ++ tasks/neutron_install_source.yml | 13 -- tasks/neutron_service_setup.yml | 153 +++++++++--------- tests/host_vars/localhost.yml | 2 - vars/source_install.yml | 3 - 7 files changed, 103 insertions(+), 97 deletions(-) create mode 100644 releasenotes/notes/neutron-service-setup-host-895ececec99d7a51.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 162e9333..15674be4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,6 +19,16 @@ debug: False + +### +### Service setup options +### + +# Set the host which will execute the shade modules +# for the service setup. The host must already have +# clouds.yaml properly configured. +neutron_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" + ### ### Packages Options ### diff --git a/meta/main.yml b/meta/main.yml index 988817b7..f1b957d5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -39,5 +39,3 @@ galaxy_info: - openstack dependencies: - galera_client - - openstack_openrc - diff --git a/releasenotes/notes/neutron-service-setup-host-895ececec99d7a51.yaml b/releasenotes/notes/neutron-service-setup-host-895ececec99d7a51.yaml new file mode 100644 index 00000000..5fb62365 --- /dev/null +++ b/releasenotes/notes/neutron-service-setup-host-895ececec99d7a51.yaml @@ -0,0 +1,17 @@ +--- +features: + - | + The service setup in keystone for neutron will now be executed + through delegation to the ``neutron_service_setup_host`` which, + by default, is ``localhost`` (the deploy host). Deployers can + opt to rather change this to the utility container by implementing + the following override in ``user_variables.yml``. + + .. code-block:: yaml + + neutron_service_setup_host: "{{ groups['utility_all'][0] }}" + +deprecations: + - | + The variable ``neutron_requires_pip_packages`` is no longer required + and has therefore been removed. diff --git a/tasks/neutron_install_source.yml b/tasks/neutron_install_source.yml index 76756bc6..ccd031e1 100644 --- a/tasks/neutron_install_source.yml +++ b/tasks/neutron_install_source.yml @@ -22,19 +22,6 @@ {% endfor %} when: neutron_developer_mode | bool -- name: Install requires pip packages - pip: - name: "{{ neutron_requires_pip_packages }}" - state: "{{ neutron_pip_package_state }}" - extra_args: >- - {{ neutron_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }} - {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} - {{ pip_install_options | default('') }} - register: install_packages - until: install_packages|success - retries: 5 - delay: 2 - - name: Retrieve checksum for venv download uri: url: "{{ neutron_venv_download_url | replace('tgz', 'checksum') }}" diff --git a/tasks/neutron_service_setup.yml b/tasks/neutron_service_setup.yml index 274b2cfd..cd8241c2 100644 --- a/tasks/neutron_service_setup.yml +++ b/tasks/neutron_service_setup.yml @@ -13,83 +13,82 @@ # 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: "{{ neutron_service_name }}" - service_type: "{{ neutron_service_type }}" - description: "{{ neutron_service_description }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - until: add_service|success - retries: 5 - delay: 2 - no_log: True +# We set the python interpreter to the ansible runtime venv if +# the delegation is to localhost so that we get access to the +# appropriate python libraries in that venv. If the delegation +# is to another host, we assume that it is accessible by the +# system python instead. +- name: Setup the service + delegate_to: "{{ neutron_service_setup_host }}" + vars: + ansible_python_interpreter: >- + {{ (neutron_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }} + block: + - name: Add service to the keystone service catalog + os_keystone_service: + cloud: default + state: present + name: "{{ neutron_service_name }}" + service_type: "{{ neutron_service_type }}" + description: "{{ neutron_service_description }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 -# 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 - no_log: True + - name: Add service user + os_user: + cloud: default + state: present + name: "{{ neutron_service_user_name }}" + password: "{{ neutron_service_password }}" + domain: default + default_project: "{{ neutron_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not neutron_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 + no_log: True -# 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 - no_log: True + - name: Add service user to admin role + os_user_role: + cloud: default + state: present + user: "{{ neutron_service_user_name }}" + role: "{{ neutron_service_role_name }}" + project: "{{ neutron_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not neutron_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 -# 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 - no_log: True + + - name: Add endpoints to keystone endpoint catalog + os_keystone_endpoint: + cloud: default + state: present + service: "{{ neutron_service_name }}" + endpoint_interface: "{{ item.interface }}" + url: "{{ item.url }}" + region: "{{ neutron_service_region }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 + with_items: + - interface: "public" + url: "{{ neutron_service_publicurl }}" + - interface: "internal" + url: "{{ neutron_service_internalurl }}" + - interface: "admin" + url: "{{ neutron_service_adminurl }}" diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml index f7fc7d66..dcb754aa 100644 --- a/tests/host_vars/localhost.yml +++ b/tests/host_vars/localhost.yml @@ -16,5 +16,3 @@ bridges: - name: "br-mgmt" ip_addr: "10.1.0.1" - -ansible_python_interpreter: "/usr/bin/python2" diff --git a/vars/source_install.yml b/vars/source_install.yml index aa1f6ada..fa550736 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -49,9 +49,6 @@ neutron_package_list: |- {% set _ = packages.extend(neutron_devel_distro_packages) %} {{ packages }} -neutron_requires_pip_packages: - - virtualenv - neutron_pip_packages: - cliff - configobj