openstack/openstack-ansible
Code Issues Proposed changes

Only implement openrc/clouds.yaml on a designated host

Browse Source 
The openrc role will no longer be executed on all OpenStack
service containers/hosts. Instead a single host is designated
through the use of the ``openstack_service_setup_host``
variable. The default is ``localhost`` (the deployment host).

While each playbook previously executed the role, it did not
need to as the role is already in each service role's meta
dependencies.

Needed-By: https://review.openstack.org/568142
Change-Id: I7bb90264ee379db5410e7ec16c5bac1ee2c398dc
This commit is contained in:
Jesse Pretorius 2018-05-13 21:20:20 +01:00
parent 8530dcc653
commit d8fcd1ae53
18 changed files with 28 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/common-playbooks/glance.yml
View File

@ -63,10 +63,6 @@
roles:
- role: "os_glance"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: glance_log_rotate
rsyslog_client_log_dir: "/var/log/glance"

4
playbooks/common-playbooks/neutron.yml
View File

@ -95,10 +95,6 @@
tags:
- bird
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: neutron_log_rotate
rsyslog_client_log_dir: "/var/log/neutron"

4
playbooks/common-playbooks/nova.yml
View File

@ -144,10 +144,6 @@
nova_management_address: "{{ management_address }}"
nova_cinder_rbd_inuse: "{{ hostvars['localhost']['nova_cinder_rbd_inuse'] }}"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: nova_log_rotate
rsyslog_client_log_dir: "/var/log/nova"

3
playbooks/os-aodh-install.yml
View File

@ -48,9 +48,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_aodh"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: aodh_log_rotate
rsyslog_client_log_dir: "/var/log/aodh"

3
playbooks/os-barbican-install.yml
View File

@ -48,9 +48,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_barbican"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: barbican_log_rotate
rsyslog_client_log_dir: "/var/log/barbican"

3
playbooks/os-ceilometer-install.yml
View File

@ -40,9 +40,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_ceilometer"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ceilometer_log_rotate
rsyslog_client_log_dir: "/var/log/ceilometer"

3
playbooks/os-congress-install.yml
View File

@ -44,9 +44,6 @@
include: common-tasks/package-cache-proxy.yml
roles:
- role: "os_congress"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: congress_log_rotate
rsyslog_client_log_dir: "/var/log/congress"

3
playbooks/os-designate-install.yml
View File

@ -64,9 +64,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_designate"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: designate_log_rotate
rsyslog_client_log_dir: "/var/log/designate"

3
playbooks/os-gnocchi-install.yml
View File

@ -54,9 +54,6 @@
tags:
- ceph
- role: "os_gnocchi"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: gnocchi_log_rotate
rsyslog_client_log_dir: "/var/log/gnocchi"

3
playbooks/os-ironic-install.yml
View File

@ -43,9 +43,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_ironic"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ironic_log_rotate
rsyslog_client_log_dir: "/var/log/ironic"

18
playbooks/os-keystone-install.yml
View File

@ -13,6 +13,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# The openstack_openrc role gets executed on a designated service
# host which will handle all service/user/domain/project/role
# management for the roles. It is executed here as this is the
# first role which will use it and the implementation of the
# clouds.yaml file is useless until keystone is in place.
- name: Implement openrc/clouds.yaml on the designated service host
hosts: "{{ openstack_service_setup_host | default('localhost') }}"
gather_facts: no
become: yes
tags:
- openrc
roles:
- role: "openstack_openrc"
- name: Prepare MQ/DB services
hosts: keystone_all
gather_facts: no
@ -117,9 +132,6 @@
roles:
- role: "os_keystone"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: keystone_log_rotate
rsyslog_client_log_dir: "/var/log/keystone"

3
playbooks/os-magnum-install.yml
View File

@ -49,9 +49,6 @@
db_name: "{{ magnum_galera_database_name }}"
when: inventory_hostname == groups['magnum_all'][0]
roles:
- role: "openstack_openrc"
tags:
- openrc
- role: "os_magnum"
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: magnum_log_rotate

3
playbooks/os-molteniron-install.yml
View File

@ -37,9 +37,6 @@
- role: "os_molteniron"
molteniron_venv_tag: "{{ openstack_release }}"
molteniron_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/molteniron-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: ironic_log_rotate
rsyslog_client_log_dir: "/var/log/ironic"

3
playbooks/os-octavia-install.yml
View File

@ -49,9 +49,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_octavia"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: octavia_log_rotate
rsyslog_client_log_dir: "/var/log/octavia"

3
playbooks/os-sahara-install.yml
View File

@ -59,9 +59,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_sahara"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: sahara_log_rotate
rsyslog_client_log_dir: "/var/log/sahara"

3
playbooks/os-tacker-install.yml
View File

@ -44,9 +44,6 @@
when: inventory_hostname == groups['tacker_all'][0]
roles:
- role: "os_tacker"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: tacker_log_rotate
rsyslog_client_log_dir: "/var/log/tacker"

3
playbooks/os-trove-install.yml
View File

@ -64,9 +64,6 @@
- hostvars['localhost']['resolvconf_enabled'] | bool
roles:
- role: "os_trove"
- role: "openstack_openrc"
tags:
- openrc
- role: "rsyslog_client"
rsyslog_client_log_rotate_file: trove_log_rotate
rsyslog_client_log_dir: "/var/log/trove"

13
releasenotes/notes/openstack-service-setup-host-f38d655eed285f57.yaml Normal file
View File

@ -0,0 +1,13 @@
---
features:
- |
The openrc role will no longer be executed on all OpenStack
service containers/hosts. Instead a single host is designated
through the use of the ``openstack_service_setup_host``
variable. The default is ``localhost`` (the deployment host).
Deployers can opt to change this to the utility container by
implementing the following override in ``user_variables.yml``.
.. code-block:: yaml
openstack_service_setup_host: "{{ groups['utility_all'][0] }}"