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. With the dependent patches, the openstack_openrc role is now executed once on the designated host, so it is no longer required as a meta-dependency for the role. Depends-On: https://review.openstack.org/579233 Depends-On: https://review.openstack.org/579959 Change-Id: Ie32143ba23b964f9ceda98f00ff9cfa1c7a131d6
This commit is contained in:
parent
4075fe7ef2
commit
b335e3c672
|
@ -17,6 +17,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.
|
||||
congress_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
|
||||
|
||||
## Set the package install state for distribution packages
|
||||
congress_pip_package_state: "latest"
|
||||
congress_package_state: "latest"
|
||||
|
@ -40,11 +45,6 @@ congress_etc_dir: "/etc/congress"
|
|||
congress_venv_download: "{{ not congress_developer_mode | bool }}"
|
||||
congress_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/congress.tgz
|
||||
|
||||
## Required PIP packages
|
||||
congress_requires_pip_packages:
|
||||
- virtualenv
|
||||
- python-keystoneclient # Keystoneclient needed to OSA keystone lib
|
||||
|
||||
## Common PIP packages
|
||||
congress_pip_packages:
|
||||
- congress
|
||||
|
|
|
@ -37,4 +37,3 @@ dependencies:
|
|||
when:
|
||||
- ansible_pkg_mgr == 'apt'
|
||||
- galera_client
|
||||
- openstack_openrc
|
||||
|
|
|
@ -34,19 +34,6 @@
|
|||
{% endfor %}
|
||||
when: congress_developer_mode | bool
|
||||
|
||||
- name: Install required pip packages
|
||||
pip:
|
||||
name: "{{ congress_requires_pip_packages }}"
|
||||
state: "{{ congress_pip_package_state }}"
|
||||
extra_args: >-
|
||||
{{ congress_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: "{{ congress_venv_download_url | replace('tgz', 'checksum') }}"
|
||||
|
|
|
@ -14,82 +14,81 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Ensure congress 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: "{{ congress_service_name }}"
|
||||
service_type: "{{ congress_service_type }}"
|
||||
description: "{{ congress_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: "{{ congress_service_setup_host }}"
|
||||
vars:
|
||||
ansible_python_interpreter: >-
|
||||
{{ (congress_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: "{{ congress_service_name }}"
|
||||
service_type: "{{ congress_service_type }}"
|
||||
description: "{{ congress_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 congress 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: "{{ congress_service_user_name }}"
|
||||
tenant_name: "{{ congress_service_project_name }}"
|
||||
password: "{{ congress_service_password }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
when: not congress_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: "{{ congress_service_user_name }}"
|
||||
password: "{{ congress_service_password }}"
|
||||
domain: default
|
||||
default_project: "{{ congress_service_project_name }}"
|
||||
endpoint_type: admin
|
||||
verify: "{{ not keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
when: not congress_service_in_ldap | bool
|
||||
until: add_service is success
|
||||
retries: 5
|
||||
delay: 10
|
||||
no_log: True
|
||||
|
||||
# Add role to the user
|
||||
- name: Ensure congress 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: "{{ congress_service_user_name }}"
|
||||
tenant_name: "{{ congress_service_project_name }}"
|
||||
role_name: "{{ congress_role_name }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
when: not congress_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: "{{ congress_service_user_name }}"
|
||||
role: "{{ congress_role_name }}"
|
||||
project: "{{ congress_service_project_name }}"
|
||||
endpoint_type: admin
|
||||
verify: "{{ not keystone_service_adminuri_insecure }}"
|
||||
register: add_service
|
||||
when: not congress_service_in_ldap | bool
|
||||
until: add_service is success
|
||||
retries: 5
|
||||
delay: 10
|
||||
|
||||
# Create an endpoint
|
||||
- name: Ensure congress 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: "{{ congress_service_region }}"
|
||||
service_name: "{{ congress_service_name }}"
|
||||
service_type: "{{ congress_service_type }}"
|
||||
insecure: "{{ keystone_service_adminuri_insecure }}"
|
||||
endpoint_list:
|
||||
- url: "{{ congress_service_publicurl }}"
|
||||
interface: "public"
|
||||
- url: "{{ congress_service_internalurl }}"
|
||||
interface: "internal"
|
||||
- url: "{{ congress_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: "{{ congress_service_name }}"
|
||||
endpoint_interface: "{{ item.interface }}"
|
||||
url: "{{ item.url }}"
|
||||
region: "{{ congress_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: "{{ congress_service_publicurl }}"
|
||||
- interface: "internal"
|
||||
url: "{{ congress_service_internalurl }}"
|
||||
- interface: "admin"
|
||||
url: "{{ congress_service_adminurl }}"
|
||||
|
|
|
@ -16,5 +16,3 @@
|
|||
bridges:
|
||||
- name: "br-mgmt"
|
||||
ip_addr: "10.1.0.1"
|
||||
|
||||
ansible_python_interpreter: "/usr/bin/python2"
|
||||
|
|
|
@ -15,8 +15,7 @@
|
|||
|
||||
- name: Playbook for deploying congress
|
||||
hosts: congress_all
|
||||
user: root
|
||||
become: true
|
||||
remote_user: root
|
||||
gather_facts: true
|
||||
any_errors_fatal: true
|
||||
pre_tasks:
|
||||
|
|
Loading…
Reference in New Issue