Refactor to use include_role
Update our playbooks to use include_role in all places. Change-Id: Id0dbf8ea2ef8f263c00c834f80838f05308ad702 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
7f1d866066
commit
0aeb21a852
|
@ -12,20 +12,25 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
---
|
||||
- name: Bootstrap node.
|
||||
- name: Bootstrap nodes
|
||||
hosts: all
|
||||
# NOTE(pabelanger): Because we are currently using a single host, we need this
|
||||
# operation to be serial. When we switch to multi-host, this can be removed.
|
||||
serial: 1
|
||||
|
||||
roles:
|
||||
- openstack.sudoers
|
||||
- openstack.virtualenv
|
||||
|
||||
pre_tasks:
|
||||
- name: Update apt cache.
|
||||
- name: Update apt cache
|
||||
become: yes
|
||||
apt:
|
||||
update_cache: yes
|
||||
upgrade: dist
|
||||
when: ansible_os_family == 'Debian'
|
||||
|
||||
tasks:
|
||||
- name: Setup openstack.sudoers role
|
||||
include_role:
|
||||
name: openstack.sudoers
|
||||
|
||||
- name: Setup openstack.virtualenv role
|
||||
include_role:
|
||||
name: openstack.virtualenv
|
||||
|
|
|
@ -15,8 +15,10 @@
|
|||
- name: Install gear.
|
||||
hosts: gear
|
||||
|
||||
roles:
|
||||
- openstack.gearman
|
||||
tasks:
|
||||
- name: Setup openstack.gearman role
|
||||
include_role:
|
||||
name: openstack.gearman
|
||||
|
||||
post_tasks:
|
||||
- name: Run gear validation.
|
||||
|
|
|
@ -12,20 +12,14 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
---
|
||||
- name: Install nodepool-builder.
|
||||
- name: Install nodepool-builder
|
||||
hosts: nodepool-builder
|
||||
|
||||
roles:
|
||||
- openstack.sudoers
|
||||
- openstack.diskimage-builder
|
||||
- openstack.shade
|
||||
- openstack.nodepool
|
||||
|
||||
pre_tasks:
|
||||
# NOTE(pabelanger): Because of ordering issues with clouds.yaml and
|
||||
# nodepool, create the required home direcotry first (pre task). So we can
|
||||
# add the clouds.yaml file.
|
||||
- name: Create nodepool user directories.
|
||||
- name: Create nodepool user directories
|
||||
include_role:
|
||||
name: openstack.nodepool
|
||||
vars:
|
||||
|
@ -33,15 +27,15 @@
|
|||
- pre
|
||||
|
||||
# TODO(pabelanger): This should be moved into ansible-role-os-client-config.
|
||||
- name: Create os-client-config directories.
|
||||
- name: Create os-client-config directories
|
||||
become: yes
|
||||
file:
|
||||
group: nodepool
|
||||
owner: nodepool
|
||||
path: "{{ nodepool_user_home }}/.config/openstack"
|
||||
path: /var/lib/nodepool/.config/openstack
|
||||
state: directory
|
||||
|
||||
- name: Create TMPDIR directory for nodepool-builder.
|
||||
- name: Create TMPDIR directory for nodepool-builder
|
||||
become: yes
|
||||
file:
|
||||
group: nodepool
|
||||
|
@ -49,16 +43,16 @@
|
|||
path: /opt/nodepool/tmp
|
||||
state: directory
|
||||
|
||||
- name: Copy clouds.yaml into place.
|
||||
- name: Copy clouds.yaml into place
|
||||
become: yes
|
||||
copy:
|
||||
dest: "{{ nodepool_user_home }}/.config/openstack/clouds.yaml"
|
||||
dest: /var/lib/nodepool/.config/openstack/clouds.yaml
|
||||
group: nodepool
|
||||
mode: 0400
|
||||
owner: nodepool
|
||||
src: "{{ windmill_config_git_dest }}/nodepool/clouds.yaml"
|
||||
|
||||
- name: Template disk-image-create wrapper script.
|
||||
- name: Template disk-image-create wrapper script
|
||||
become: yes
|
||||
template:
|
||||
dest: /usr/local/bin/disk-image-create
|
||||
|
@ -68,12 +62,28 @@
|
|||
src: nodepool-builder/usr/local/bin/disk-image-create.j2
|
||||
|
||||
tasks:
|
||||
- name: Setup openstack.logrotate role.
|
||||
- name: Setup openstack.sudoers role
|
||||
include_role:
|
||||
name: openstack.sudoers
|
||||
|
||||
- name: Setup openstack.diskimage-builder role
|
||||
include_role:
|
||||
name: openstack.diskimage-builder
|
||||
|
||||
- name: Setup openstack.shade role
|
||||
include_role:
|
||||
name: openstack.shade
|
||||
|
||||
- name: Setup openstack.nodepool role
|
||||
include_role:
|
||||
name: openstack.nodepool
|
||||
|
||||
- name: Setup openstack.logrotate role
|
||||
include_role:
|
||||
name: openstack.logrotate
|
||||
|
||||
post_tasks:
|
||||
- name: Run nodepool-server validation.
|
||||
- name: Run nodepool-server validation
|
||||
include_role:
|
||||
name: test.nodepool-builder
|
||||
|
||||
|
|
|
@ -15,10 +15,6 @@
|
|||
- name: Install nodepool-launcher.
|
||||
hosts: nodepool-launcher
|
||||
|
||||
roles:
|
||||
- openstack.shade
|
||||
- openstack.nodepool
|
||||
|
||||
pre_tasks:
|
||||
# NOTE(pabelanger): Because of ordering issues with clouds.yaml and
|
||||
# nodepool, create the required home direcotry first (pre task). So we can
|
||||
|
@ -36,20 +32,28 @@
|
|||
file:
|
||||
group: nodepool
|
||||
owner: nodepool
|
||||
path: "{{ nodepool_user_home }}/.config/openstack"
|
||||
path: /var/lib/nodepool/.config/openstack
|
||||
state: directory
|
||||
|
||||
- name: Copy clouds.yaml into place.
|
||||
become: yes
|
||||
copy:
|
||||
dest: "{{ nodepool_user_home }}/.config/openstack/clouds.yaml"
|
||||
dest: /var/lib/nodepool/.config/openstack/clouds.yaml
|
||||
group: nodepool
|
||||
mode: 0400
|
||||
owner: nodepool
|
||||
src: "{{ windmill_config_git_dest }}/nodepool/clouds.yaml"
|
||||
|
||||
tasks:
|
||||
- name: Setup openstack.logrotate role.
|
||||
- name: Setup openstack.shade role
|
||||
include_role:
|
||||
name: openstack.shade
|
||||
|
||||
- name: Setup openstack.nodepool role
|
||||
include_role:
|
||||
name: openstack.nodepool
|
||||
|
||||
- name: Setup openstack.logrotate role
|
||||
include_role:
|
||||
name: openstack.logrotate
|
||||
|
||||
|
|
|
@ -12,9 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
---
|
||||
- name: Prove our CI tools are working.
|
||||
- name: Prove our CI tools are working
|
||||
hosts: bastion
|
||||
|
||||
roles:
|
||||
- role: test.prove
|
||||
tasks:
|
||||
- name: Setup test.prove role
|
||||
include_role:
|
||||
name: test.prove
|
||||
when: zuul_success | bool
|
||||
|
|
|
@ -12,13 +12,15 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
---
|
||||
- name: Install zookeeper.
|
||||
- name: Install zookeeper
|
||||
hosts: zookeeper
|
||||
|
||||
roles:
|
||||
- openstack.zookeeper
|
||||
tasks:
|
||||
- name: Setup openstack.zookeeper role
|
||||
include_role:
|
||||
name: openstack.zookeeper
|
||||
|
||||
post_tasks:
|
||||
- name: Run zookeeper validation.
|
||||
- name: Run zookeeper validation
|
||||
include_role:
|
||||
name: test.zookeeper
|
||||
|
|
Loading…
Reference in New Issue