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.

There are any other tasks in the role which need updating before we can
eliminate the octavia_requires_pip_packages, but for the sake of keeping
the patch smaller and easier to review they will be done in follow up
patches.

Change-Id: I10f6d82cbdfe19fea577f276f95691115a07e01c
This commit is contained in:
Jesse Pretorius 2018-07-12 19:11:31 +01:00
parent 3fc40ec770
commit faf5d66876
3 changed files with 94 additions and 79 deletions

View File

@ -16,6 +16,11 @@
## Verbosity Options ## Verbosity Options
debug: False debug: False
# Set the host which will execute the shade modules
# for the service setup. The host must already have
# clouds.yaml properly configured.
octavia_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
## Octavia standalone (v2) experimental ## Octavia standalone (v2) experimental
octavia_v2: True octavia_v2: True

View File

@ -0,0 +1,12 @@
---
features:
- |
The service setup in keystone for octavia will now be executed
through delegation to the ``octavia_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
octavia_service_setup_host: "{{ groups['utility_all'][0] }}"

View File

@ -13,85 +13,83 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Create a service # We set the python interpreter to the ansible runtime venv if
- name: Ensure octavia service # the delegation is to localhost so that we get access to the
keystone: # appropriate python libraries in that venv. If the delegation
command: "ensure_service" # is to another host, we assume that it is accessible by the
endpoint: "{{ keystone_service_adminurl }}" # system python instead.
login_user: "{{ keystone_admin_user_name }}" - name: Setup the service
login_password: "{{ keystone_auth_admin_password }}" delegate_to: "{{ octavia_service_setup_host }}"
login_project_name: "{{ keystone_admin_tenant_name }}" vars:
service_name: "{{ octavia_service_name }}" ansible_python_interpreter: >-
service_type: "{{ octavia_service_type }}" {{ (octavia_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable']) }}
description: "{{ octavia_service_description }}" block:
insecure: "{{ keystone_service_adminuri_insecure }}" - name: Add service to the keystone service catalog
register: add_service os_keystone_service:
until: add_service is success cloud: default
retries: 5 state: present
delay: 10 name: "{{ octavia_service_name }}"
no_log: True service_type: "{{ octavia_service_type }}"
description: "{{ octavia_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: Add service user
- name: Ensure octavia user os_user:
keystone: cloud: default
command: "ensure_user" state: present
endpoint: "{{ keystone_service_adminurl }}" name: "{{ octavia_service_user_name }}"
login_user: "{{ keystone_admin_user_name }}" password: "{{ octavia_service_password }}"
login_password: "{{ keystone_auth_admin_password }}" domain: default
login_project_name: "{{ keystone_admin_tenant_name }}" default_project: "{{ octavia_service_project_name }}"
user_name: "{{ octavia_service_user_name }}" endpoint_type: admin
tenant_name: "{{ octavia_service_project_name }}" verify: "{{ not keystone_service_adminuri_insecure }}"
password: "{{ octavia_service_password }}" register: add_service
insecure: "{{ keystone_service_adminuri_insecure }}" when: not octavia_service_in_ldap | bool
register: add_service until: add_service is success
when: not octavia_service_in_ldap | bool retries: 5
until: add_service is success delay: 10
retries: 5 no_log: True
delay: 10
no_log: True
# Add a role to the user - name: Add service user to admin role
- name: Ensure octavia user to admin role os_user_role:
keystone: cloud: default
command: "ensure_user_role" state: present
endpoint: "{{ keystone_service_adminurl }}" user: "{{ octavia_service_user_name }}"
login_user: "{{ keystone_admin_user_name }}" role: "{{ octavia_service_role_name }}"
login_password: "{{ keystone_auth_admin_password }}" project: "{{ octavia_service_project_name }}"
login_project_name: "{{ keystone_admin_tenant_name }}" endpoint_type: admin
user_name: "{{ octavia_service_user_name }}" verify: "{{ not keystone_service_adminuri_insecure }}"
tenant_name: "{{ octavia_service_project_name }}" register: add_service
role_name: "{{ octavia_service_role_name }}" when: not octavia_service_in_ldap | bool
insecure: "{{ keystone_service_adminuri_insecure }}" until: add_service is success
register: add_service retries: 5
when: not octavia_service_in_ldap | bool delay: 10
until: add_service is success
retries: 5 - name: Add endpoints to keystone endpoint catalog
delay: 10 os_keystone_endpoint:
no_log: True cloud: default
state: present
service: "{{ octavia_service_name }}"
endpoint_interface: "{{ item.interface }}"
url: "{{ item.url }}"
region: "{{ octavia_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: "{{ octavia_service_publicuri }}"
- interface: "internal"
url: "{{ octavia_service_internaluri }}"
- interface: "admin"
url: "{{ octavia_service_adminuri }}"
when: octavia_v2 | bool
# Create an endpoint (v2 only)
# V1 uses a direct URL in the neutron conf
- name: Ensure octavia 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: "{{ octavia_service_region }}"
service_name: "{{ octavia_service_name }}"
service_type: "{{ octavia_service_type }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
endpoint_list:
- url: "{{ octavia_service_publicuri }}"
interface: "public"
- url: "{{ octavia_service_internaluri }}"
interface: "internal"
- url: "{{ octavia_service_adminuri }}"
interface: "admin"
register: add_service_v2
until: add_service_v2 is success
retries: 5
delay: 10
no_log: True
when: octavia_v2 | bool