diff --git a/defaults/main.yml b/defaults/main.yml index 6199d02..107a231 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,6 +14,11 @@ ## Verbosity Options debug: False +# Set the host which will execute the shade modules +# for the service setup. The host must already have +# clouds.yaml properly configured. +sahara_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" + # Set the package install state for distribution and pip packages # Options are 'present' and 'latest' sahara_package_state: "latest" @@ -152,12 +157,6 @@ sahara_policy_dirs: policy.d sahara_service_in_ldap: False -# Sahara packages that must be installed before anything else -sahara_requires_pip_packages: - - virtualenv - - python-keystoneclient # Keystoneclient needed to OSA keystone lib - - httplib2 - # Common pip packages sahara_pip_packages: - cryptography diff --git a/meta/main.yml b/meta/main.yml index 2ba3a13..87eb050 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -28,4 +28,3 @@ dependencies: when: - ansible_pkg_mgr == 'apt' - galera_client - - openstack_openrc diff --git a/releasenotes/notes/sahara-service-setup-host-18f57fbc1671adfc.yaml b/releasenotes/notes/sahara-service-setup-host-18f57fbc1671adfc.yaml new file mode 100644 index 0000000..de9f132 --- /dev/null +++ b/releasenotes/notes/sahara-service-setup-host-18f57fbc1671adfc.yaml @@ -0,0 +1,17 @@ +--- +features: + - | + The service setup in keystone for sahara will now be executed + through delegation to the ``sahara_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 + + sahara_service_setup_host: "{{ groups['utility_all'][0] }}" + +deprecations: + - | + The variable ``sahara_requires_pip_packages`` is no longer required + and has therefore been removed. diff --git a/tasks/sahara_install.yml b/tasks/sahara_install.yml index 7da3584..c9037cd 100644 --- a/tasks/sahara_install.yml +++ b/tasks/sahara_install.yml @@ -33,19 +33,6 @@ when: - sahara_developer_mode | bool -- name: Install requires pip packages - pip: - name: "{{ sahara_requires_pip_packages }}" - state: "{{ sahara_pip_package_state }}" - extra_args: >- - {{ sahara_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: "{{ sahara_venv_download_url | replace('tgz', 'checksum') }}" diff --git a/tasks/sahara_service_setup.yml b/tasks/sahara_service_setup.yml index 60ce6f5..3f230d6 100644 --- a/tasks/sahara_service_setup.yml +++ b/tasks/sahara_service_setup.yml @@ -11,100 +11,93 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Create a service -- name: Ensure sahara 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: "{{ sahara_service_name }}" - service_type: "{{ sahara_service_type }}" - description: "{{ sahara_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: "{{ sahara_service_setup_host }}" + vars: + ansible_python_interpreter: >- + {{ (sahara_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: "{{ sahara_service_name }}" + service_type: "{{ sahara_service_type }}" + description: "{{ sahara_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 sahara 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: "{{ sahara_service_user_name }}" - tenant_name: "{{ sahara_service_project_name }}" - password: "{{ sahara_service_password }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - when: not sahara_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: "{{ sahara_service_user_name }}" + password: "{{ sahara_service_password }}" + domain: default + default_project: "{{ sahara_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not sahara_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 + no_log: True -# Add a role to the user -- name: Ensure sahara 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: "{{ sahara_service_user_name }}" - tenant_name: "{{ sahara_service_project_name }}" - role_name: "{{ sahara_role_name }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - when: not sahara_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: "{{ sahara_service_user_name }}" + role: "{{ sahara_role_name }}" + project: "{{ sahara_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not sahara_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 -# Create an endpoint -- name: Ensure sahara 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: "{{ sahara_service_region }}" - service_name: "{{ sahara_service_name }}" - service_type: "{{ sahara_service_type }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - endpoint_list: - - url: "{{ sahara_service_publicurl }}" - interface: "public" - - url: "{{ sahara_service_internalurl }}" - interface: "internal" - - url: "{{ sahara_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: "{{ sahara_service_name }}" + endpoint_interface: "{{ item.interface }}" + url: "{{ item.url }}" + region: "{{ sahara_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: "{{ sahara_service_publicurl }}" + - interface: "internal" + url: "{{ sahara_service_internalurl }}" + - interface: "admin" + url: "{{ sahara_service_adminurl }}" -# Create proxy domain -- name: Ensure sahara_proxy domain - keystone: - command: "ensure_domain" - domain_name: "{{ sahara_proxy_user_domain_name }}" - login_user: "{{ keystone_admin_user_name }}" - login_password: "{{ keystone_auth_admin_password }}" - login_project_name: "{{ keystone_admin_tenant_name }}" - endpoint: "{{ keystone_service_adminurl }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_sahara_proxy_domain - until: add_sahara_proxy_domain|success - retries: 5 - delay: 10 - when: sahara_use_domain_for_proxy_users|bool - no_log: True + - name: Add proxy domain + os_keystone_domain: + cloud: default + state: present + name: "{{ sahara_proxy_user_domain_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml index 4384b96..072e30f 100644 --- a/tests/host_vars/localhost.yml +++ b/tests/host_vars/localhost.yml @@ -14,7 +14,6 @@ # limitations under the License. ansible_host: 127.0.0.1 -ansible_python_interpreter: "/usr/bin/python2" bridges: - name: "br-mgmt" ip_addr: "10.1.1.1"