Switch zuul-cloner to use openstack prefix for roles

Since it is possible we want to creat windmill.nodepool-builder, avoid
using windmill for cloned roles right now.

Change-Id: I2521b55b6bfc002991a6f4894819062ee6b0c205
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-01-04 19:11:36 -05:00
parent f8d9bc2331
commit de2885a61d
10 changed files with 18 additions and 18 deletions

View File

@ -19,7 +19,7 @@
serial: 1
roles:
- windmill.virtualenv
- openstack.virtualenv
pre_tasks:
# NOTE(pabelanger): We need to make sure apt does not have a stale package

View File

@ -16,9 +16,9 @@
hosts: nodepool-builder
roles:
- windmill.diskimage-builder
- windmill.shade
- windmill.nodepool
- openstack.diskimage-builder
- openstack.shade
- openstack.nodepool
pre_tasks:
# NOTE(pabelanger): Move this to ansible-role-sudoers

View File

@ -16,8 +16,8 @@
hosts: nodepool-deleter
roles:
- windmill.shade
- windmill.nodepool
- openstack.shade
- openstack.nodepool
pre_tasks:
# TODO(pabelanger): This should be moved into ansible-role-os-client-config.

View File

@ -16,8 +16,8 @@
hosts: nodepool-launcher
roles:
- windmill.shade
- windmill.nodepool
- openstack.shade
- openstack.nodepool
pre_tasks:
# TODO(pabelanger): This should be moved into ansible-role-os-client-config.

View File

@ -16,9 +16,9 @@
hosts: nodepool-server
roles:
- windmill.shade
- windmill.nodepool
- windmill.ssh
- openstack.shade
- openstack.nodepool
- openstack.ssh
pre_tasks:
# TODO(pabelanger): This should be moved into ansible-role-os-client-config.

View File

@ -16,7 +16,7 @@
hosts: zookeeper
roles:
- windmill.zookeeper
- openstack.zookeeper
post_tasks:
- name: Run zookeeper validation.

View File

@ -16,8 +16,8 @@
hosts: zuul-launcher
roles:
- windmill.jenkins-job-builder
- windmill.zuul
- openstack.jenkins-job-builder
- openstack.zuul
post_tasks:
- name: Run zuul-launcher validation.

View File

@ -16,7 +16,7 @@
hosts: zuul-merger
roles:
- windmill.zuul
- openstack.zuul
post_tasks:
- name: Run zuul-merger validation.

View File

@ -16,8 +16,8 @@
hosts: zuul-server
roles:
- windmill.zuul
- windmill.ssh
- openstack.zuul
- openstack.ssh
post_tasks:
- name: Run zuul-server validation.

View File

@ -21,7 +21,7 @@ trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/ansible-role-(.*)'
dest: 'playbooks/roles/windmill.\1'
dest: 'playbooks/roles/openstack.\1'
EOF
zuul-cloner -m $CLONEMAP \