diff --git a/defaults/main.yml b/defaults/main.yml index c45721c..de4b675 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. +panko_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}" + # Set the package install state for distribution and pip packages # Options are 'present' and 'latest' panko_package_state: "latest" @@ -91,12 +96,6 @@ panko_service_adminurl: "{{ panko_service_adminuri }}" panko_service_in_ldap: false -# panko packages that must be installed before anything else -panko_requires_pip_packages: - - virtualenv - - python-keystoneclient # Keystoneclient needed to OSA keystone lib - - httplib2 - # Common pip packages panko_pip_packages: - alembic>=0.7.2 diff --git a/meta/main.yml b/meta/main.yml index 88c141d..a782373 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -36,4 +36,3 @@ dependencies: when: - ansible_pkg_mgr == 'apt' - galera_client - - openstack_openrc diff --git a/tasks/panko_install.yml b/tasks/panko_install.yml index 5a94b9e..470aa86 100644 --- a/tasks/panko_install.yml +++ b/tasks/panko_install.yml @@ -47,19 +47,6 @@ {% endfor %} when: panko_developer_mode | bool -- name: Install requires pip packages - pip: - name: "{{ panko_requires_pip_packages }}" - state: "{{ panko_pip_package_state }}" - extra_args: >- - {{ panko_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 is success - retries: 5 - delay: 2 - - name: Retrieve checksum for venv download uri: url: "{{ panko_venv_download_url | replace('tgz', 'checksum') }}" diff --git a/tasks/panko_service_setup.yml b/tasks/panko_service_setup.yml index 91b781d..f78d1f0 100644 --- a/tasks/panko_service_setup.yml +++ b/tasks/panko_service_setup.yml @@ -13,81 +13,81 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Ensure panko 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: "{{ panko_service_name }}" - service_type: "{{ panko_service_type }}" - description: "{{ panko_service_description }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - until: add_service is 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: "{{ panko_service_setup_host }}" + vars: + ansible_python_interpreter: >- + {{ (panko_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: "{{ panko_service_name }}" + service_type: "{{ panko_service_type }}" + description: "{{ panko_service_description }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + until: add_service is success + retries: 5 + delay: 10 -- name: Ensure panko 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: "{{ panko_service_user_name }}" - tenant_name: "{{ panko_service_tenant_name }}" - role_name: "{{ panko_role_name }}" - password: "{{ panko_service_password }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_service - when: not panko_service_in_ldap | bool - until: add_service is success - retries: 5 - delay: 10 - no_log: True + - name: Add service user + os_user: + cloud: default + state: present + name: "{{ panko_service_user_name }}" + password: "{{ panko_service_password }}" + domain: default + default_project: "{{ panko_service_tenant_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not panko_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 + no_log: True -- name: Ensure panko 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: "{{ panko_service_user_name }}" - tenant_name: "{{ panko_service_project_name }}" - role_name: "{{ panko_role_name }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - register: add_admin_role - when: not panko_service_in_ldap | bool - until: add_admin_role is success - retries: 5 - delay: 10 - no_log: True + - name: Add service user to admin role + os_user_role: + cloud: default + state: present + user: "{{ panko_service_user_name }}" + role: "{{ panko_role_name }}" + project: "{{ panko_service_project_name }}" + endpoint_type: admin + verify: "{{ not keystone_service_adminuri_insecure }}" + register: add_service + when: not panko_service_in_ldap | bool + until: add_service is success + retries: 5 + delay: 10 -# Create an endpoint -- name: Ensure panko 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: "{{ panko_service_region }}" - service_name: "{{ panko_service_name }}" - service_type: "{{ panko_service_type }}" - insecure: "{{ keystone_service_adminuri_insecure }}" - endpoint_list: - - url: "{{ panko_service_publicurl }}" - interface: "public" - - url: "{{ panko_service_adminurl }}" - interface: "admin" - - url: "{{ panko_service_internalurl }}" - interface: "internal" - register: add_service - until: add_service is success - retries: 5 - delay: 10 - no_log: True + - name: Add endpoints to keystone endpoint catalog + os_keystone_endpoint: + cloud: default + state: present + service: "{{ panko_service_name }}" + endpoint_interface: "{{ item.interface }}" + url: "{{ item.url }}" + region: "{{ panko_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: "{{ panko_service_publicurl }}" + - interface: "internal" + url: "{{ panko_service_internalurl }}" + - interface: "admin" + url: "{{ panko_service_adminurl }}" diff --git a/tests/host_vars/localhost.yml b/tests/host_vars/localhost.yml index 14bf3b0..6c26f31 100644 --- a/tests/host_vars/localhost.yml +++ b/tests/host_vars/localhost.yml @@ -15,5 +15,3 @@ bridges: - "br-mgmt" - -ansible_python_interpreter: "/usr/bin/python2" \ No newline at end of file diff --git a/tests/test-install-panko.yml b/tests/test-install-panko.yml index 4c417e4..e1781ea 100644 --- a/tests/test-install-panko.yml +++ b/tests/test-install-panko.yml @@ -17,7 +17,7 @@ hosts: panko_all user: root gather_facts: true - roles: - - role: "{{ panko_rolename | default('os_panko') }}" vars_files: - common/test-vars.yml + roles: + - role: "os_panko"