windmill
/
windmill
Code Issues Proposed changes

Revert "Zuul clone openstack-infra dependencies" 

With zuulv3-dev.o.o now working, we no longer need to do this.  As git
repos will be pushed to the node already.

This reverts commit 6487d40e38.

Change-Id: I0e8e156261325a7cf5869f923009777c98db841d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-01 09:10:27 -05:00
parent 6dde329fea
commit b40a3b0f05
9 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playbooks/group_vars/nodepool-builder.yaml
View File

@ -13,26 +13,18 @@
# under the License.
---
# windmill.diskimage-builder
diskimage_builder_install_method: pip
diskimage_builder_pip_name: file:///tmp/diskimage-builder
diskimage_builder_pip_virtualenv: /opt/venv/nodepool-builder
# windmill.nodepool
# We default to pip, since we zuul clone nodepool into the /tmp folder.
nodepool_install_method: pip
nodepool_pip_name: file:///tmp/nodepool
nodepool_pip_virtualenv: /opt/venv/nodepool-builder
nodepool_file_nodepool_builder_service_config_src: nodepool/etc/sysconfig/nodepool.j2
nodepool_pip_virtualenv: /opt/venv/nodepool-builder
nodepool_service_nodepool_manage: false
nodepool_service_nodepool_deleter_manage: false
nodepool_service_nodepool_launcher_manage: false
# windmill.shade
# We default to pip, since we zuul clone shade into the /tmp folder.
shade_install_method: pip
shade_pip_name: file:///tmp/shade
shade_pip_virtualenv: /opt/venv/nodepool-builder
# openstack.sudoers

10
playbooks/group_vars/nodepool-deleter.yaml
View File

@ -13,21 +13,15 @@
# under the License.
---
# windmill.nodepool
# We default to pip, since we zuul clone nodepool into the /tmp folder.
nodepool_install_method: pip
nodepool_pip_name: file:///tmp/nodepool
nodepool_pip_virtualenv: /opt/venv/nodepool-deleter
nodepool_file_nodepool_deleter_service_config_src: nodepool/etc/sysconfig/nodepool.j2
nodepool_pip_virtualenv: /opt/venv/nodepool-deleter
nodepool_service_nodepool_manage: false
nodepool_service_nodepool_builder_manage: false
nodepool_service_nodepool_launcher_manage: false
# windmill.shade
# We default to pip, since we zuul clone shade into the /tmp folder.
shade_install_method: pip
shade_pip_name: file:///tmp/shade
shade_pip_virtualenv: /opt/venv/nodepool-deleter
windmill_nodepool_service_config:

10
playbooks/group_vars/nodepool-launcher.yaml
View File

@ -13,21 +13,15 @@
# under the License.
---
# windmill.nodepool
# We default to pip, since we zuul clone nodepool into the /tmp folder.
nodepool_install_method: pip
nodepool_pip_name: file:///tmp/nodepool
nodepool_pip_virtualenv: /opt/venv/nodepool-launcher
nodepool_file_nodepool_launcher_service_config_src: nodepool/etc/sysconfig/nodepool.j2
nodepool_pip_virtualenv: /opt/venv/nodepool-launcher
nodepool_service_nodepool_manage: false
nodepool_service_nodepool_builder_manage: false
nodepool_service_nodepool_deleter_manage: false
# windmill.shade
# We default to pip, since we zuul clone shade into the /tmp folder.
shade_install_method: pip
shade_pip_name: file:///tmp/shade
shade_pip_virtualenv: /opt/venv/nodepool-launcher
windmill_nodepool_service_config:

10
playbooks/group_vars/nodepool-server.yaml
View File

@ -13,13 +13,10 @@
# under the License.
---
# windmill.nodepool
# We default to pip, since we zuul clone nodepool into the /tmp folder.
nodepool_install_method: pip
nodepool_pip_name: file:///tmp/nodepool
nodepool_pip_virtualenv: /opt/venv/nodepool
nodepool_file_nodepool_service_config_src: nodepool/etc/sysconfig/nodepool.j2
nodepool_pip_virtualenv: /opt/venv/nodepool
nodepool_service_nodepool_builder_manage: false
nodepool_service_nodepool_deleter_manage: false
nodepool_service_nodepool_launcher_manage: false
@ -31,9 +28,6 @@ ssh_key_public_content: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPFYsTS2aTFpgJHACEZjtkr4kt7rf9fHjavl5OhCq7rwAzfiQfq25YSaCZRRPywjUg6stm5JmBCLvQAa1LuhpsrUTE61TvGBIxeRwE6B0OecPW8SoXNbhgvfdrgVb4OIvH51tndPmXYPMpVN03iWyoSfN58YE77Z0VipDuG++dAjSJg+bmBlmmVE3L1419E2Jm56OnRDADWEDlvYciEIXaFWN9pIYXTL+Q1QdYKkWGPfuvMu6k5xSgQtNeXO4IWLSKyqkqj/PRQeY7XVBNstRhGzy+10fV0J4LrYcTAs/80rI2qgvrRoiDuXuhPMXyyD0OxoVrlIO4/f7BD2xk1lbq6JrUQthsNeLn9O5KVX9H7zhnFM1EUSRZz+knasDRfv8jrfrhUtM1QpF/3LITKftrjbr9whpOrxGSKSRRtnYlS5OrY1o9qqEfYPbelQdnz4oa+aTl0R7ApLfRpg64tbF1uNyVXwJvm7EYY2Ju1t0dY6vxFWlC8lLujE4Zq/VWajf5FhzsIh6SD0NVdz8UK1W/sZYKczejo0UHgQujfuJeJ3wRWAB/idzP2B69/uFJn7gp6199637j3v/3l38xRPi/kbh8zK0LjwvR8PKOlTx8pMJzNFaLzRqOTVJzhl4YmlYXtiNpxf/7/dPRUu8kJlb+yvVPo811v537EnmtsXin9w== nodepool@example.org
# windmill.shade
# We default to pip, since we zuul clone shade into the /tmp folder.
shade_install_method: pip
shade_pip_name: file:///tmp/shade
shade_pip_virtualenv: /opt/venv/nodepool
windmill_nodepool_service_config:

7
playbooks/group_vars/zuul-launcher.yaml
View File

@ -16,13 +16,10 @@
jenkins_job_builder_pip_virtualenv: /opt/venv/zuul-launcher
# windmill.zuul
# We default to pip, since we zuul clone zuul into the /tmp folder.
zuul_install_method: pip
zuul_pip_name: file:///tmp/zuul
zuul_pip_virtualenv: /opt/venv/zuul-launcher
zuul_file_zuul_launcher_service_config_src: zuul/etc/sysconfig/zuul-launcher
zuul_pip_virtualenv: /opt/venv/zuul-launcher
zuul_service_zuul_merger_enabled: no
zuul_service_zuul_merger_manage: false
zuul_service_zuul_merger_state: stopped

7
playbooks/group_vars/zuul-merger.yaml
View File

@ -13,13 +13,10 @@
# under the License.
---
# windmill.zuul
# We default to pip, since we zuul clone zuul into the /tmp folder.
zuul_install_method: pip
zuul_pip_name: file:///tmp/zuul
zuul_pip_virtualenv: /opt/venv/zuul-merger
zuul_file_zuul_merger_service_config_src: zuul/etc/sysconfig/zuul-merger
zuul_pip_virtualenv: /opt/venv/zuul-merger
zuul_service_zuul_launcher_enabled: no
zuul_service_zuul_launcher_manage: false
zuul_service_zuul_launcher_state: stopped

7
playbooks/group_vars/zuul-server.yaml
View File

@ -13,13 +13,10 @@
# under the License.
---
# windmill.zuul
# We default to pip, since we zuul clone zuul into the /tmp folder.
zuul_install_method: pip
zuul_pip_name: file:///tmp/zuul
zuul_pip_virtualenv: /opt/venv/zuul-server
zuul_file_zuul_server_service_config_src: zuul/etc/sysconfig/zuul-server
zuul_pip_virtualenv: /opt/venv/zuul-server
zuul_service_zuul_launcher_enabled: no
zuul_service_zuul_launcher_manage: false
zuul_service_zuul_launcher_state: stopped

8
tools/zuul_cloner.sh → tools/install_roles.sh
View File

@ -22,8 +22,6 @@ cat > $CLONEMAP << EOF
clonemap:
- name: 'openstack/ansible-role-(.*)'
dest: 'playbooks/roles/openstack.\1'
- name: 'openstack(-infra)?/(?!ansible-role)(.*)'
dest: '/tmp/\2'
EOF
zuul-cloner -m $CLONEMAP \
@ -37,8 +35,4 @@ zuul-cloner -m $CLONEMAP \
openstack/ansible-role-sudoers \
openstack/ansible-role-virtualenv \
openstack/ansible-role-zookeeper \
openstack/ansible-role-zuul \
openstack/diskimage-builder \
openstack-infra/nodepool \
openstack-infra/shade \
openstack-infra/zuul
openstack/ansible-role-zuul

6
tox.ini
View File

@ -19,7 +19,7 @@ commands = bindep test
deps = -r{toxinidir}/requirements.txt
commands =
{toxinidir}/tools/install_bindep.sh
{toxinidir}/tools/zuul_cloner.sh
{toxinidir}/tools/install_roles.sh
# NOTE(pabelanger): Because ansible default ansible_user to null now, we need to pass it via CLI.
ansible-playbook -i playbooks/inventory playbooks/build-images.yaml -e ansible_user={env:USER} {posargs}
passenv =
@ -34,7 +34,7 @@ setenv =
deps = -r{toxinidir}/requirements.txt
commands =
{toxinidir}/tools/install_bindep.sh
{toxinidir}/tools/zuul_cloner.sh
{toxinidir}/tools/install_roles.sh
# NOTE(pabelanger): Because ansible default ansible_user to null now, we need to pass it via CLI.
ansible-playbook -i playbooks/inventory playbooks/site.yaml -e ansible_user={env:USER} {posargs}
passenv =
@ -49,7 +49,7 @@ setenv =
deps = -r{toxinidir}/requirements.txt
commands =
{toxinidir}/tools/install_bindep.sh
{toxinidir}/tools/zuul_cloner.sh
{toxinidir}/tools/install_roles.sh
# NOTE(pabelanger): Because ansible default ansible_user to null now, we need to pass it via CLI.
ansible-playbook -i playbooks/inventory playbooks/build-images.yaml -e ansible_user={env:USER} {posargs}
passenv =