diff --git a/playbooks/group_vars/nodepool-builder.yaml b/playbooks/group_vars/nodepool-builder.yaml index 6e4a46c..ea4dfad 100644 --- a/playbooks/group_vars/nodepool-builder.yaml +++ b/playbooks/group_vars/nodepool-builder.yaml @@ -13,18 +13,26 @@ # 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 -nodepool_file_nodepool_builder_service_config_src: nodepool/etc/sysconfig/nodepool.j2 - +# 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_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 diff --git a/playbooks/group_vars/nodepool-deleter.yaml b/playbooks/group_vars/nodepool-deleter.yaml index d8cd0cf..ce67c82 100644 --- a/playbooks/group_vars/nodepool-deleter.yaml +++ b/playbooks/group_vars/nodepool-deleter.yaml @@ -13,15 +13,21 @@ # under the License. --- # windmill.nodepool -nodepool_file_nodepool_deleter_service_config_src: nodepool/etc/sysconfig/nodepool.j2 - +# 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_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: diff --git a/playbooks/group_vars/nodepool-launcher.yaml b/playbooks/group_vars/nodepool-launcher.yaml index b91f712..d4da555 100644 --- a/playbooks/group_vars/nodepool-launcher.yaml +++ b/playbooks/group_vars/nodepool-launcher.yaml @@ -13,15 +13,21 @@ # under the License. --- # windmill.nodepool -nodepool_file_nodepool_launcher_service_config_src: nodepool/etc/sysconfig/nodepool.j2 - +# 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_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: diff --git a/playbooks/group_vars/nodepool-server.yaml b/playbooks/group_vars/nodepool-server.yaml index 4258577..cf4bdb5 100644 --- a/playbooks/group_vars/nodepool-server.yaml +++ b/playbooks/group_vars/nodepool-server.yaml @@ -13,10 +13,13 @@ # under the License. --- # windmill.nodepool -nodepool_file_nodepool_service_config_src: nodepool/etc/sysconfig/nodepool.j2 - +# 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_service_nodepool_builder_manage: false nodepool_service_nodepool_deleter_manage: false nodepool_service_nodepool_launcher_manage: false @@ -28,6 +31,9 @@ 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: diff --git a/playbooks/group_vars/zuul-launcher.yaml b/playbooks/group_vars/zuul-launcher.yaml index 9948fdd..72f268e 100644 --- a/playbooks/group_vars/zuul-launcher.yaml +++ b/playbooks/group_vars/zuul-launcher.yaml @@ -16,10 +16,13 @@ jenkins_job_builder_pip_virtualenv: /opt/venv/zuul-launcher # windmill.zuul -zuul_file_zuul_launcher_service_config_src: zuul/etc/sysconfig/zuul-launcher - +# 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_service_zuul_merger_enabled: no zuul_service_zuul_merger_manage: false zuul_service_zuul_merger_state: stopped diff --git a/playbooks/group_vars/zuul-merger.yaml b/playbooks/group_vars/zuul-merger.yaml index c01622a..0cfd03b 100644 --- a/playbooks/group_vars/zuul-merger.yaml +++ b/playbooks/group_vars/zuul-merger.yaml @@ -13,10 +13,13 @@ # under the License. --- # windmill.zuul -zuul_file_zuul_merger_service_config_src: zuul/etc/sysconfig/zuul-merger - +# 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_service_zuul_launcher_enabled: no zuul_service_zuul_launcher_manage: false zuul_service_zuul_launcher_state: stopped diff --git a/playbooks/group_vars/zuul-server.yaml b/playbooks/group_vars/zuul-server.yaml index 761b07d..77e2e20 100644 --- a/playbooks/group_vars/zuul-server.yaml +++ b/playbooks/group_vars/zuul-server.yaml @@ -13,10 +13,13 @@ # under the License. --- # windmill.zuul -zuul_file_zuul_server_service_config_src: zuul/etc/sysconfig/zuul-server - +# 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_service_zuul_launcher_enabled: no zuul_service_zuul_launcher_manage: false zuul_service_zuul_launcher_state: stopped diff --git a/tools/install_roles.sh b/tools/zuul_cloner.sh similarity index 84% rename from tools/install_roles.sh rename to tools/zuul_cloner.sh index 199ec16..1297339 100755 --- a/tools/install_roles.sh +++ b/tools/zuul_cloner.sh @@ -22,6 +22,8 @@ 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 \ @@ -35,4 +37,8 @@ zuul-cloner -m $CLONEMAP \ openstack/ansible-role-sudoers \ openstack/ansible-role-virtualenv \ openstack/ansible-role-zookeeper \ - openstack/ansible-role-zuul + openstack/ansible-role-zuul \ + openstack/diskimage-builder \ + openstack-infra/nodepool \ + openstack-infra/shade \ + openstack-infra/zuul diff --git a/tox.ini b/tox.ini index 0587ffa..d867899 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ commands = bindep test deps = -r{toxinidir}/requirements.txt commands = {toxinidir}/tools/install_bindep.sh - {toxinidir}/tools/install_roles.sh + {toxinidir}/tools/zuul_cloner.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/install_roles.sh + {toxinidir}/tools/zuul_cloner.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/install_roles.sh + {toxinidir}/tools/zuul_cloner.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 =