diff --git a/doc/source/dns.rst b/doc/source/dns.rst index e2019228b3..4427523144 100644 --- a/doc/source/dns.rst +++ b/doc/source/dns.rst @@ -17,7 +17,7 @@ At a Glance * ns1.opendev.org * ns2.opendev.org :Ansible: - * :git_file:`playbooks/group_vars/dns.yaml` + * :git_file:`inventory/service/group_vars/dns.yaml` :Projects: * https://www.nlnetlabs.nl/projects/nsd/ * https://www.isc.org/downloads/bind/doc/ @@ -27,7 +27,7 @@ Adding a Zone To add a new zone, identify an existing git repository or create a new one to hold the contents of the zone, then update -:git_file:`playbooks/group_vars/dns.yaml`. +:git_file:`inventory/service/group_vars/dns.yaml`. Run:: diff --git a/doc/source/etherpad.rst b/doc/source/etherpad.rst index 5ac6285dfe..78be55359b 100644 --- a/doc/source/etherpad.rst +++ b/doc/source/etherpad.rst @@ -19,7 +19,7 @@ At a Glance * https://opendev.org/opendev/system-config * :git_file:`playbooks/roles/etherpad` * :git_file:`playbooks/service-etherpad.yaml` - * :git_file:`playbooks/host_vars/etherpad01.opendev.org.yaml` + * :git_file:`inventory/service/host_vars/etherpad01.opendev.org.yaml` :Projects: * http://etherpad.org/ * https://github.com/ether/etherpad-lite diff --git a/doc/source/gitea.rst b/doc/source/gitea.rst index 6c177bb06c..a060031da5 100644 --- a/doc/source/gitea.rst +++ b/doc/source/gitea.rst @@ -17,7 +17,7 @@ At a Glance * :git_file:`playbooks/roles/gitea` * :git_file:`playbooks/roles/haproxy` :Configuration: - * :git_file:`playbooks/group_vars/gitea-lb.yaml` + * :git_file:`inventory/service/group_vars/gitea-lb.yaml` :Projects: * https://gitea.io/ :Bugs: diff --git a/doc/source/letsencrypt.rst b/doc/source/letsencrypt.rst index c8af78508f..7dda8006cd 100644 --- a/doc/source/letsencrypt.rst +++ b/doc/source/letsencrypt.rst @@ -79,7 +79,7 @@ A basic configuration consists of the following steps: The roles look for certificate configuration in a ``letsencrypt_certs`` variable defined for each host. This is usually done via specific host variables in - ``playbooks/host_vars/.opendev.org.yaml``. For a simple + ``inventory/service/host_vars/.opendev.org.yaml``. For a simple host that wants a single certificate to cover its numeric hostname and regular ``CNAME`` this would look like :: diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst index 99542d40f0..06759b3ff6 100644 --- a/doc/source/sysadmin.rst +++ b/doc/source/sysadmin.rst @@ -134,7 +134,7 @@ To create a new server, do the following: * You should be able to install and configure most software only with ansible or puppet. Nonetheless, if you need SSH access to the host, - add your public key to :git_file:`playbooks/group_vars/all.yaml` and + add your public key to :git_file:`inventory/service/group_vars/all.yaml` and include a stanza like this in your server class:: extra_users: diff --git a/playbooks/group_vars/all.yaml b/inventory/base/group_vars/all.yaml similarity index 96% rename from playbooks/group_vars/all.yaml rename to inventory/base/group_vars/all.yaml index b78bca4cc4..1c686f515c 100644 --- a/playbooks/group_vars/all.yaml +++ b/inventory/base/group_vars/all.yaml @@ -184,5 +184,3 @@ disabled_users: - shrews - dmsimard - pabelanger - -gerrit_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+pCQlTAQYmCrOY6aPbvbyKQDcOCXibPNGIjnPPMuEItCS0vtRnqEBz7znWZS5Drq9yKpROh6uFF01ao2VnNjw6f+NdRNV19RWVe6mYN+qa2VrH2caLwBrKPiH0Xc/eK41D55dZU7IWwKYAw/NpiBaBfHavFwipI+rmEb68MH2hcimDdr/bji+0hkh3X+42dkNvmMdtkuCW6nKdAEhnXaHZc5SJR/EvzgRCfB8vbML13p46O9xhoJgn7ZWvMb3vaR5jxIkQwstUR36raEVhttBDEuWasWnHYbrM1zd3ooudbTEQf5vXISZKFygHyJFFqb4iQ76i+hDlb0VQKZCdaol gerrit-code-review@829f141b0fa5 diff --git a/inventory/openstack.yaml b/inventory/base/hosts.yaml similarity index 100% rename from inventory/openstack.yaml rename to inventory/base/hosts.yaml diff --git a/playbooks/group_vars/adns.yaml b/inventory/service/group_vars/adns.yaml similarity index 100% rename from playbooks/group_vars/adns.yaml rename to inventory/service/group_vars/adns.yaml diff --git a/playbooks/group_vars/afs.yaml b/inventory/service/group_vars/afs.yaml similarity index 100% rename from playbooks/group_vars/afs.yaml rename to inventory/service/group_vars/afs.yaml diff --git a/playbooks/group_vars/afsdb.yaml b/inventory/service/group_vars/afsdb.yaml similarity index 100% rename from playbooks/group_vars/afsdb.yaml rename to inventory/service/group_vars/afsdb.yaml diff --git a/inventory/service/group_vars/all.yaml b/inventory/service/group_vars/all.yaml new file mode 100644 index 0000000000..ce57c1530b --- /dev/null +++ b/inventory/service/group_vars/all.yaml @@ -0,0 +1 @@ +gerrit_ssh_rsa_pubkey_contents: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+pCQlTAQYmCrOY6aPbvbyKQDcOCXibPNGIjnPPMuEItCS0vtRnqEBz7znWZS5Drq9yKpROh6uFF01ao2VnNjw6f+NdRNV19RWVe6mYN+qa2VrH2caLwBrKPiH0Xc/eK41D55dZU7IWwKYAw/NpiBaBfHavFwipI+rmEb68MH2hcimDdr/bji+0hkh3X+42dkNvmMdtkuCW6nKdAEhnXaHZc5SJR/EvzgRCfB8vbML13p46O9xhoJgn7ZWvMb3vaR5jxIkQwstUR36raEVhttBDEuWasWnHYbrM1zd3ooudbTEQf5vXISZKFygHyJFFqb4iQ76i+hDlb0VQKZCdaol gerrit-code-review@829f141b0fa5 diff --git a/playbooks/group_vars/ask.yaml b/inventory/service/group_vars/ask.yaml similarity index 100% rename from playbooks/group_vars/ask.yaml rename to inventory/service/group_vars/ask.yaml diff --git a/playbooks/group_vars/cloud-launcher.yaml b/inventory/service/group_vars/cloud-launcher.yaml similarity index 100% rename from playbooks/group_vars/cloud-launcher.yaml rename to inventory/service/group_vars/cloud-launcher.yaml diff --git a/playbooks/group_vars/dns.yaml b/inventory/service/group_vars/dns.yaml similarity index 100% rename from playbooks/group_vars/dns.yaml rename to inventory/service/group_vars/dns.yaml diff --git a/playbooks/group_vars/eavesdrop.yaml b/inventory/service/group_vars/eavesdrop.yaml similarity index 100% rename from playbooks/group_vars/eavesdrop.yaml rename to inventory/service/group_vars/eavesdrop.yaml diff --git a/playbooks/group_vars/elasticsearch.yaml b/inventory/service/group_vars/elasticsearch.yaml similarity index 100% rename from playbooks/group_vars/elasticsearch.yaml rename to inventory/service/group_vars/elasticsearch.yaml diff --git a/playbooks/group_vars/files.yaml b/inventory/service/group_vars/files.yaml similarity index 100% rename from playbooks/group_vars/files.yaml rename to inventory/service/group_vars/files.yaml diff --git a/playbooks/group_vars/firehose.yaml b/inventory/service/group_vars/firehose.yaml similarity index 100% rename from playbooks/group_vars/firehose.yaml rename to inventory/service/group_vars/firehose.yaml diff --git a/playbooks/group_vars/futureparser.yaml b/inventory/service/group_vars/futureparser.yaml similarity index 100% rename from playbooks/group_vars/futureparser.yaml rename to inventory/service/group_vars/futureparser.yaml diff --git a/playbooks/group_vars/gerrit.yaml b/inventory/service/group_vars/gerrit.yaml similarity index 100% rename from playbooks/group_vars/gerrit.yaml rename to inventory/service/group_vars/gerrit.yaml diff --git a/playbooks/group_vars/git-loadbalancer.yaml b/inventory/service/group_vars/git-loadbalancer.yaml similarity index 100% rename from playbooks/group_vars/git-loadbalancer.yaml rename to inventory/service/group_vars/git-loadbalancer.yaml diff --git a/playbooks/group_vars/gitea-lb.yaml b/inventory/service/group_vars/gitea-lb.yaml similarity index 100% rename from playbooks/group_vars/gitea-lb.yaml rename to inventory/service/group_vars/gitea-lb.yaml diff --git a/playbooks/group_vars/gitea.yaml b/inventory/service/group_vars/gitea.yaml similarity index 100% rename from playbooks/group_vars/gitea.yaml rename to inventory/service/group_vars/gitea.yaml diff --git a/playbooks/group_vars/graphite.yaml b/inventory/service/group_vars/graphite.yaml similarity index 100% rename from playbooks/group_vars/graphite.yaml rename to inventory/service/group_vars/graphite.yaml diff --git a/playbooks/group_vars/groups.yaml b/inventory/service/group_vars/groups.yaml similarity index 100% rename from playbooks/group_vars/groups.yaml rename to inventory/service/group_vars/groups.yaml diff --git a/playbooks/group_vars/jvb.yaml b/inventory/service/group_vars/jvb.yaml similarity index 100% rename from playbooks/group_vars/jvb.yaml rename to inventory/service/group_vars/jvb.yaml diff --git a/playbooks/group_vars/kdc.yaml b/inventory/service/group_vars/kdc.yaml similarity index 100% rename from playbooks/group_vars/kdc.yaml rename to inventory/service/group_vars/kdc.yaml diff --git a/playbooks/group_vars/logstash.yaml b/inventory/service/group_vars/logstash.yaml similarity index 100% rename from playbooks/group_vars/logstash.yaml rename to inventory/service/group_vars/logstash.yaml diff --git a/playbooks/group_vars/mailman.yaml b/inventory/service/group_vars/mailman.yaml similarity index 100% rename from playbooks/group_vars/mailman.yaml rename to inventory/service/group_vars/mailman.yaml diff --git a/playbooks/group_vars/meetpad.yaml b/inventory/service/group_vars/meetpad.yaml similarity index 100% rename from playbooks/group_vars/meetpad.yaml rename to inventory/service/group_vars/meetpad.yaml diff --git a/playbooks/group_vars/mirror.yaml b/inventory/service/group_vars/mirror.yaml similarity index 100% rename from playbooks/group_vars/mirror.yaml rename to inventory/service/group_vars/mirror.yaml diff --git a/playbooks/group_vars/nodepool-builder.yaml b/inventory/service/group_vars/nodepool-builder.yaml similarity index 100% rename from playbooks/group_vars/nodepool-builder.yaml rename to inventory/service/group_vars/nodepool-builder.yaml diff --git a/playbooks/group_vars/nodepool-builder_opendev.yaml b/inventory/service/group_vars/nodepool-builder_opendev.yaml similarity index 100% rename from playbooks/group_vars/nodepool-builder_opendev.yaml rename to inventory/service/group_vars/nodepool-builder_opendev.yaml diff --git a/playbooks/group_vars/nodepool-launcher.yaml b/inventory/service/group_vars/nodepool-launcher.yaml similarity index 100% rename from playbooks/group_vars/nodepool-launcher.yaml rename to inventory/service/group_vars/nodepool-launcher.yaml diff --git a/playbooks/group_vars/nodepool-launcher_opendev.yaml b/inventory/service/group_vars/nodepool-launcher_opendev.yaml similarity index 100% rename from playbooks/group_vars/nodepool-launcher_opendev.yaml rename to inventory/service/group_vars/nodepool-launcher_opendev.yaml diff --git a/playbooks/group_vars/nodepool.yaml b/inventory/service/group_vars/nodepool.yaml similarity index 100% rename from playbooks/group_vars/nodepool.yaml rename to inventory/service/group_vars/nodepool.yaml diff --git a/playbooks/group_vars/ns.yaml b/inventory/service/group_vars/ns.yaml similarity index 100% rename from playbooks/group_vars/ns.yaml rename to inventory/service/group_vars/ns.yaml diff --git a/playbooks/group_vars/openstackid-dev.yaml b/inventory/service/group_vars/openstackid-dev.yaml similarity index 100% rename from playbooks/group_vars/openstackid-dev.yaml rename to inventory/service/group_vars/openstackid-dev.yaml diff --git a/playbooks/group_vars/openstackid.yaml b/inventory/service/group_vars/openstackid.yaml similarity index 100% rename from playbooks/group_vars/openstackid.yaml rename to inventory/service/group_vars/openstackid.yaml diff --git a/playbooks/group_vars/pbx.yaml b/inventory/service/group_vars/pbx.yaml similarity index 100% rename from playbooks/group_vars/pbx.yaml rename to inventory/service/group_vars/pbx.yaml diff --git a/playbooks/group_vars/puppet.yaml b/inventory/service/group_vars/puppet.yaml similarity index 100% rename from playbooks/group_vars/puppet.yaml rename to inventory/service/group_vars/puppet.yaml diff --git a/playbooks/group_vars/puppet4.yaml b/inventory/service/group_vars/puppet4.yaml similarity index 100% rename from playbooks/group_vars/puppet4.yaml rename to inventory/service/group_vars/puppet4.yaml diff --git a/playbooks/group_vars/registry.yaml b/inventory/service/group_vars/registry.yaml similarity index 100% rename from playbooks/group_vars/registry.yaml rename to inventory/service/group_vars/registry.yaml diff --git a/playbooks/group_vars/static.yaml b/inventory/service/group_vars/static.yaml similarity index 100% rename from playbooks/group_vars/static.yaml rename to inventory/service/group_vars/static.yaml diff --git a/playbooks/group_vars/storyboard-dev.yaml b/inventory/service/group_vars/storyboard-dev.yaml similarity index 100% rename from playbooks/group_vars/storyboard-dev.yaml rename to inventory/service/group_vars/storyboard-dev.yaml diff --git a/playbooks/group_vars/storyboard.yaml b/inventory/service/group_vars/storyboard.yaml similarity index 100% rename from playbooks/group_vars/storyboard.yaml rename to inventory/service/group_vars/storyboard.yaml diff --git a/playbooks/group_vars/webservers.yaml b/inventory/service/group_vars/webservers.yaml similarity index 100% rename from playbooks/group_vars/webservers.yaml rename to inventory/service/group_vars/webservers.yaml diff --git a/playbooks/group_vars/wiki.yaml b/inventory/service/group_vars/wiki.yaml similarity index 100% rename from playbooks/group_vars/wiki.yaml rename to inventory/service/group_vars/wiki.yaml diff --git a/playbooks/group_vars/zookeeper.yaml b/inventory/service/group_vars/zookeeper.yaml similarity index 100% rename from playbooks/group_vars/zookeeper.yaml rename to inventory/service/group_vars/zookeeper.yaml diff --git a/playbooks/group_vars/zuul-executor-opendev.yaml b/inventory/service/group_vars/zuul-executor-opendev.yaml similarity index 100% rename from playbooks/group_vars/zuul-executor-opendev.yaml rename to inventory/service/group_vars/zuul-executor-opendev.yaml diff --git a/playbooks/group_vars/zuul-executor.yaml b/inventory/service/group_vars/zuul-executor.yaml similarity index 100% rename from playbooks/group_vars/zuul-executor.yaml rename to inventory/service/group_vars/zuul-executor.yaml diff --git a/playbooks/group_vars/zuul-merger.yaml b/inventory/service/group_vars/zuul-merger.yaml similarity index 100% rename from playbooks/group_vars/zuul-merger.yaml rename to inventory/service/group_vars/zuul-merger.yaml diff --git a/playbooks/group_vars/zuul-preview.yaml b/inventory/service/group_vars/zuul-preview.yaml similarity index 100% rename from playbooks/group_vars/zuul-preview.yaml rename to inventory/service/group_vars/zuul-preview.yaml diff --git a/playbooks/group_vars/zuul-scheduler.yaml b/inventory/service/group_vars/zuul-scheduler.yaml similarity index 100% rename from playbooks/group_vars/zuul-scheduler.yaml rename to inventory/service/group_vars/zuul-scheduler.yaml diff --git a/playbooks/group_vars/zuul.yaml b/inventory/service/group_vars/zuul.yaml similarity index 100% rename from playbooks/group_vars/zuul.yaml rename to inventory/service/group_vars/zuul.yaml diff --git a/inventory/groups.yaml b/inventory/service/groups.yaml similarity index 100% rename from inventory/groups.yaml rename to inventory/service/groups.yaml diff --git a/playbooks/host_vars/adns1.opendev.org.yaml b/inventory/service/host_vars/adns1.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/adns1.opendev.org.yaml rename to inventory/service/host_vars/adns1.opendev.org.yaml diff --git a/playbooks/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml similarity index 100% rename from playbooks/host_vars/bridge.openstack.org.yaml rename to inventory/service/host_vars/bridge.openstack.org.yaml diff --git a/playbooks/host_vars/etherpad01.opendev.org.yaml b/inventory/service/host_vars/etherpad01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/etherpad01.opendev.org.yaml rename to inventory/service/host_vars/etherpad01.opendev.org.yaml diff --git a/playbooks/host_vars/gitea01.opendev.org.yaml b/inventory/service/host_vars/gitea01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea01.opendev.org.yaml rename to inventory/service/host_vars/gitea01.opendev.org.yaml diff --git a/playbooks/host_vars/gitea02.opendev.org.yaml b/inventory/service/host_vars/gitea02.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea02.opendev.org.yaml rename to inventory/service/host_vars/gitea02.opendev.org.yaml diff --git a/playbooks/host_vars/gitea03.opendev.org.yaml b/inventory/service/host_vars/gitea03.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea03.opendev.org.yaml rename to inventory/service/host_vars/gitea03.opendev.org.yaml diff --git a/playbooks/host_vars/gitea04.opendev.org.yaml b/inventory/service/host_vars/gitea04.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea04.opendev.org.yaml rename to inventory/service/host_vars/gitea04.opendev.org.yaml diff --git a/playbooks/host_vars/gitea05.opendev.org.yaml b/inventory/service/host_vars/gitea05.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea05.opendev.org.yaml rename to inventory/service/host_vars/gitea05.opendev.org.yaml diff --git a/playbooks/host_vars/gitea06.opendev.org.yaml b/inventory/service/host_vars/gitea06.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea06.opendev.org.yaml rename to inventory/service/host_vars/gitea06.opendev.org.yaml diff --git a/playbooks/host_vars/gitea07.opendev.org.yaml b/inventory/service/host_vars/gitea07.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea07.opendev.org.yaml rename to inventory/service/host_vars/gitea07.opendev.org.yaml diff --git a/playbooks/host_vars/gitea08.opendev.org.yaml b/inventory/service/host_vars/gitea08.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/gitea08.opendev.org.yaml rename to inventory/service/host_vars/gitea08.opendev.org.yaml diff --git a/playbooks/host_vars/graphite01.opendev.org.yaml b/inventory/service/host_vars/graphite01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/graphite01.opendev.org.yaml rename to inventory/service/host_vars/graphite01.opendev.org.yaml diff --git a/playbooks/host_vars/insecure-ci-registry01.opendev.org.yaml b/inventory/service/host_vars/insecure-ci-registry01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/insecure-ci-registry01.opendev.org.yaml rename to inventory/service/host_vars/insecure-ci-registry01.opendev.org.yaml diff --git a/playbooks/host_vars/lists.katacontainers.io.yaml b/inventory/service/host_vars/lists.katacontainers.io.yaml similarity index 100% rename from playbooks/host_vars/lists.katacontainers.io.yaml rename to inventory/service/host_vars/lists.katacontainers.io.yaml diff --git a/playbooks/host_vars/lists.openstack.org.yaml b/inventory/service/host_vars/lists.openstack.org.yaml similarity index 100% rename from playbooks/host_vars/lists.openstack.org.yaml rename to inventory/service/host_vars/lists.openstack.org.yaml diff --git a/playbooks/host_vars/meetpad01.opendev.org.yaml b/inventory/service/host_vars/meetpad01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/meetpad01.opendev.org.yaml rename to inventory/service/host_vars/meetpad01.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml b/inventory/service/host_vars/mirror01.bhs1.ovh.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.bhs1.ovh.opendev.org.yaml rename to inventory/service/host_vars/mirror01.bhs1.ovh.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org b/inventory/service/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org similarity index 100% rename from playbooks/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org rename to inventory/service/host_vars/mirror01.ca-ymq-1.vexxhost.opendev.org diff --git a/playbooks/host_vars/mirror01.dfw.rax.opendev.org.yaml b/inventory/service/host_vars/mirror01.dfw.rax.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.dfw.rax.opendev.org.yaml rename to inventory/service/host_vars/mirror01.dfw.rax.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.iad.rax.opendev.org.yaml b/inventory/service/host_vars/mirror01.iad.rax.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.iad.rax.opendev.org.yaml rename to inventory/service/host_vars/mirror01.iad.rax.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml b/inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml rename to inventory/service/host_vars/mirror01.kna1.airship-citycloud.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.ord.rax.opendev.org.yaml b/inventory/service/host_vars/mirror01.ord.rax.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.ord.rax.opendev.org.yaml rename to inventory/service/host_vars/mirror01.ord.rax.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.regionone.limestone.opendev.org b/inventory/service/host_vars/mirror01.regionone.limestone.opendev.org similarity index 100% rename from playbooks/host_vars/mirror01.regionone.limestone.opendev.org rename to inventory/service/host_vars/mirror01.regionone.limestone.opendev.org diff --git a/playbooks/host_vars/mirror01.regionone.linaro-us.opendev.org.yaml b/inventory/service/host_vars/mirror01.regionone.linaro-us.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.regionone.linaro-us.opendev.org.yaml rename to inventory/service/host_vars/mirror01.regionone.linaro-us.opendev.org.yaml diff --git a/playbooks/host_vars/mirror01.sjc1.vexxhost.opendev.org b/inventory/service/host_vars/mirror01.sjc1.vexxhost.opendev.org similarity index 100% rename from playbooks/host_vars/mirror01.sjc1.vexxhost.opendev.org rename to inventory/service/host_vars/mirror01.sjc1.vexxhost.opendev.org diff --git a/playbooks/host_vars/mirror01.us-east.openedge.opendev.org.yaml b/inventory/service/host_vars/mirror01.us-east.openedge.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror01.us-east.openedge.opendev.org.yaml rename to inventory/service/host_vars/mirror01.us-east.openedge.opendev.org.yaml diff --git a/playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml b/inventory/service/host_vars/mirror02.gra1.ovh.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror02.gra1.ovh.opendev.org.yaml rename to inventory/service/host_vars/mirror02.gra1.ovh.opendev.org.yaml diff --git a/playbooks/host_vars/mirror02.mtl01.inap.opendev.org.yaml b/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/mirror02.mtl01.inap.opendev.org.yaml rename to inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml diff --git a/playbooks/host_vars/nb01.opendev.org.yaml b/inventory/service/host_vars/nb01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/nb01.opendev.org.yaml rename to inventory/service/host_vars/nb01.opendev.org.yaml diff --git a/playbooks/host_vars/nb02.opendev.org.yaml b/inventory/service/host_vars/nb02.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/nb02.opendev.org.yaml rename to inventory/service/host_vars/nb02.opendev.org.yaml diff --git a/playbooks/host_vars/nb04.opendev.org.yaml b/inventory/service/host_vars/nb04.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/nb04.opendev.org.yaml rename to inventory/service/host_vars/nb04.opendev.org.yaml diff --git a/playbooks/host_vars/ns1.opendev.org.yaml b/inventory/service/host_vars/ns1.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/ns1.opendev.org.yaml rename to inventory/service/host_vars/ns1.opendev.org.yaml diff --git a/playbooks/host_vars/ns2.opendev.org.yaml b/inventory/service/host_vars/ns2.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/ns2.opendev.org.yaml rename to inventory/service/host_vars/ns2.opendev.org.yaml diff --git a/playbooks/host_vars/refstack.openstack.org.yaml b/inventory/service/host_vars/refstack.openstack.org.yaml similarity index 100% rename from playbooks/host_vars/refstack.openstack.org.yaml rename to inventory/service/host_vars/refstack.openstack.org.yaml diff --git a/playbooks/host_vars/review-dev01.opendev.org.yaml b/inventory/service/host_vars/review-dev01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/review-dev01.opendev.org.yaml rename to inventory/service/host_vars/review-dev01.opendev.org.yaml diff --git a/playbooks/host_vars/review01.openstack.org.yaml b/inventory/service/host_vars/review01.openstack.org.yaml similarity index 100% rename from playbooks/host_vars/review01.openstack.org.yaml rename to inventory/service/host_vars/review01.openstack.org.yaml diff --git a/playbooks/host_vars/static01.opendev.org.yaml b/inventory/service/host_vars/static01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/static01.opendev.org.yaml rename to inventory/service/host_vars/static01.opendev.org.yaml diff --git a/playbooks/host_vars/zuul01.openstack.org b/inventory/service/host_vars/zuul01.openstack.org similarity index 100% rename from playbooks/host_vars/zuul01.openstack.org rename to inventory/service/host_vars/zuul01.openstack.org diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/openstack.py b/playbooks/roles/install-ansible/files/inventory_plugins/openstack.py deleted file mode 100644 index b61e802d62..0000000000 --- a/playbooks/roles/install-ansible/files/inventory_plugins/openstack.py +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright (c) 2012, Marco Vito Moscaritolo -# Copyright (c) 2013, Jesse Keating -# Copyright (c) 2015, Hewlett-Packard Development Company, L.P. -# Copyright (c) 2016, Rackspace Australia -# Copyright (c) 2017 Ansible Project -# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) - -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -DOCUMENTATION = ''' - name: openstack - plugin_type: inventory - authors: - - Marco Vito Moscaritolo - - Jesse Keating - short_description: OpenStack inventory source - extends_documentation_fragment: - - inventory_cache - - constructed - description: - - Get inventory hosts from OpenStack clouds - - Uses openstack.(yml|yaml) YAML configuration file to configure the inventory plugin - - Uses standard clouds.yaml YAML configuration file to configure cloud credentials - options: - show_all: - description: toggles showing all vms vs only those with a working IP - type: bool - default: 'no' - inventory_hostname: - description: | - What to register as the inventory hostname. - If set to 'uuid' the uuid of the server will be used and a - group will be created for the server name. - If set to 'name' the name of the server will be used unless - there are more than one server with the same name in which - case the 'uuid' logic will be used. - Default is to do 'name', which is the opposite of the old - openstack.py inventory script's option use_hostnames) - type: string - choices: - - name - - uuid - default: "name" - expand_hostvars: - description: | - Run extra commands on each host to fill in additional - information about the host. May interrogate cinder and - neutron and can be expensive for people with many hosts. - (Note, the default value of this is opposite from the default - old openstack.py inventory script's option expand_hostvars) - type: bool - default: 'no' - private: - description: | - Use the private interface of each server, if it has one, as - the host's IP in the inventory. This can be useful if you are - running ansible inside a server in the cloud and would rather - communicate to your servers over the private network. - type: bool - default: 'no' - only_clouds: - description: | - List of clouds from clouds.yaml to use, instead of using - the whole list. - type: list - default: [] - fail_on_errors: - description: | - Causes the inventory to fail and return no hosts if one cloud - has failed (for example, bad credentials or being offline). - When set to False, the inventory will return as many hosts as - it can from as many clouds as it can contact. (Note, the - default value of this is opposite from the old openstack.py - inventory script's option fail_on_errors) - type: bool - default: 'no' - clouds_yaml_path: - description: | - Override path to clouds.yaml file. If this value is given it - will be searched first. The default path for the - ansible inventory adds /etc/ansible/openstack.yaml and - /etc/ansible/openstack.yml to the regular locations documented - at https://docs.openstack.org/os-client-config/latest/user/configuration.html#config-files - type: string - compose: - description: Create vars from jinja2 expressions. - type: dictionary - default: {} - groups: - description: Add hosts to group based on Jinja2 conditionals. - type: dictionary - default: {} -''' - -EXAMPLES = ''' -# file must be named openstack.yaml or openstack.yml -# Make the plugin behave like the default behavior of the old script -plugin: openstack -expand_hostvars: yes -fail_on_errors: yes -''' - -import collections - -from ansible.errors import AnsibleParserError -from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable - -try: - # Due to the name shadowing we should import other way - import importlib - sdk = importlib.import_module('openstack') - sdk_inventory = importlib.import_module('openstack.cloud.inventory') - client_config = importlib.import_module('openstack.config.loader') - HAS_SDK = True -except ImportError: - HAS_SDK = False - - -class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable): - ''' Host inventory provider for ansible using OpenStack clouds. ''' - - NAME = 'openstack' - - def parse(self, inventory, loader, path, cache=True): - - super(InventoryModule, self).parse(inventory, loader, path) - - cache_key = self._get_cache_prefix(path) - - # file is config file - self._config_data = self._read_config_data(path) - - msg = '' - if not self._config_data: - msg = 'File empty. this is not my config file' - elif 'plugin' in self._config_data and self._config_data['plugin'] != self.NAME: - msg = 'plugin config file, but not for us: %s' % self._config_data['plugin'] - elif 'plugin' not in self._config_data and 'clouds' not in self._config_data: - msg = "it's not a plugin configuration nor a clouds.yaml file" - elif not HAS_SDK: - msg = "openstacksdk is required for the OpenStack inventory plugin. OpenStack inventory sources will be skipped." - - if msg: - raise AnsibleParserError(msg) - - # The user has pointed us at a clouds.yaml file. Use defaults for - # everything. - if 'clouds' in self._config_data: - self._config_data = {} - - if cache: - cache = self.get_option('cache') - source_data = None - if cache: - try: - source_data = self.cache.get(cache_key) - except KeyError: - pass - - if not source_data: - clouds_yaml_path = self._config_data.get('clouds_yaml_path') - if clouds_yaml_path: - config_files = (clouds_yaml_path + - client_config.CONFIG_FILES) - else: - config_files = None - - # TODO(mordred) Integrate shade's logging with ansible's logging - sdk.enable_logging() - - cloud_inventory = sdk_inventory.OpenStackInventory( - config_files=config_files, - private=self._config_data.get('private', False)) - only_clouds = self._config_data.get('only_clouds', []) - if only_clouds and not isinstance(only_clouds, list): - raise ValueError( - 'OpenStack Inventory Config Error: only_clouds must be' - ' a list') - if only_clouds: - new_clouds = [] - for cloud in cloud_inventory.clouds: - if cloud.name in only_clouds: - new_clouds.append(cloud) - cloud_inventory.clouds = new_clouds - - expand_hostvars = self._config_data.get('expand_hostvars', False) - fail_on_errors = self._config_data.get('fail_on_errors', False) - - source_data = cloud_inventory.list_hosts( - expand=expand_hostvars, fail_on_cloud_config=fail_on_errors) - - self.cache.set(cache_key, source_data) - - self._populate_from_source(source_data) - - def _populate_from_source(self, source_data): - groups = collections.defaultdict(list) - firstpass = collections.defaultdict(list) - hostvars = {} - - use_server_id = ( - self._config_data.get('inventory_hostname', 'name') != 'name') - show_all = self._config_data.get('show_all', False) - - for server in source_data: - if 'interface_ip' not in server and not show_all: - continue - firstpass[server['name']].append(server) - - for name, servers in firstpass.items(): - if len(servers) == 1 and not use_server_id: - self._append_hostvars(hostvars, groups, name, servers[0]) - else: - server_ids = set() - # Trap for duplicate results - for server in servers: - server_ids.add(server['id']) - if len(server_ids) == 1 and not use_server_id: - self._append_hostvars(hostvars, groups, name, servers[0]) - else: - for server in servers: - self._append_hostvars( - hostvars, groups, server['id'], server, - namegroup=True) - - self._set_variables(hostvars, groups) - - def _set_variables(self, hostvars, groups): - - # set vars in inventory from hostvars - for host in hostvars: - - # create composite vars - self._set_composite_vars( - self._config_data.get('compose'), hostvars, host) - - # actually update inventory - for key in hostvars[host]: - self.inventory.set_variable(host, key, hostvars[host][key]) - - # constructed groups based on conditionals - self._add_host_to_composed_groups( - self._config_data.get('groups'), hostvars, host) - - for group_name, group_hosts in groups.items(): - self.inventory.add_group(group_name) - for host in group_hosts: - self.inventory.add_child(group_name, host) - - def _get_groups_from_server(self, server_vars, namegroup=True): - groups = [] - - region = server_vars['region'] - cloud = server_vars['cloud'] - metadata = server_vars.get('metadata', {}) - - # Create a group for the cloud - groups.append(cloud) - - # Create a group on region - groups.append(region) - - # And one by cloud_region - groups.append("%s_%s" % (cloud, region)) - - # Check if group metadata key in servers' metadata - if 'group' in metadata: - groups.append(metadata['group']) - - for extra_group in metadata.get('groups', '').split(','): - if extra_group: - groups.append(extra_group.strip()) - - groups.append('instance-%s' % server_vars['id']) - if namegroup: - groups.append(server_vars['name']) - - for key in ('flavor', 'image'): - if 'name' in server_vars[key]: - groups.append('%s-%s' % (key, server_vars[key]['name'])) - - for key, value in iter(metadata.items()): - groups.append('meta-%s_%s' % (key, value)) - - az = server_vars.get('az', None) - if az: - # Make groups for az, region_az and cloud_region_az - groups.append(az) - groups.append('%s_%s' % (region, az)) - groups.append('%s_%s_%s' % (cloud, region, az)) - return groups - - def _append_hostvars(self, hostvars, groups, current_host, - server, namegroup=False): - hostvars[current_host] = dict( - ansible_ssh_host=server['interface_ip'], - ansible_host=server['interface_ip'], - openstack=server) - self.inventory.add_host(current_host) - - for group in self._get_groups_from_server(server, namegroup=namegroup): - groups[group].append(current_host) - - def verify_file(self, path): - - if super(InventoryModule, self).verify_file(path): - for fn in ('openstack', 'clouds'): - for suffix in ('yaml', 'yml'): - maybe = '{fn}.{suffix}'.format(fn=fn, suffix=suffix) - if path.endswith(maybe): - return True - return False diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/groups.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/groups.yaml index b5f1b3aa80..df70ccf615 120000 --- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/groups.yaml +++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/groups.yaml @@ -1 +1 @@ -../../../../../../inventory/groups.yaml \ No newline at end of file +../../../../../../inventory/service/groups.yaml \ No newline at end of file diff --git a/playbooks/roles/install-ansible/tasks/main.yaml b/playbooks/roles/install-ansible/tasks/main.yaml index afa438affc..4b60745edd 100644 --- a/playbooks/roles/install-ansible/tasks/main.yaml +++ b/playbooks/roles/install-ansible/tasks/main.yaml @@ -98,10 +98,10 @@ src: ansible.cfg.j2 dest: /etc/ansible/ansible.cfg -- name: Copy static inventory in place - copy: - src: 'inventory/{{ item }}' - dest: '/etc/ansible/hosts/{{ item }}' +- name: Remove old inventory files + file: + path: '/etc/ansible/hosts/{{ item }}' + state: absent loop: - openstack.yaml - groups.yaml @@ -139,14 +139,6 @@ cmd: bash install_modules.sh chdir: /etc/puppet -# NOTE(mordred) The copy of the openstack inventory plugin from 2.6 is busted. -# It doesn't proerly deal with caching. A fix has been submitted upstream, but -# for now this is a fixed copy. -- name: Copy fixed openstack inventory in place - copy: - src: inventory_plugins/openstack.py - dest: /etc/ansible/inventory_plugins/openstack.py - - name: Copy yamlgroup inventory in place copy: src: inventory_plugins/yamlgroup.py diff --git a/playbooks/roles/install-ansible/templates/ansible.cfg.j2 b/playbooks/roles/install-ansible/templates/ansible.cfg.j2 index 1b26a29417..ab3769c6ce 100644 --- a/playbooks/roles/install-ansible/templates/ansible.cfg.j2 +++ b/playbooks/roles/install-ansible/templates/ansible.cfg.j2 @@ -1,5 +1,5 @@ [defaults] -inventory=/etc/ansible/hosts/openstack.yaml,/etc/ansible/hosts/groups.yaml,/etc/ansible/hosts/emergency.yaml +inventory=/home/zuul/src/opendev.org/src/opendev/system-config/inventory/base/hosts.yaml,/home/zuul/src/opendev.org/src/opendev/system-config/inventory/service/groups.yaml,/etc/ansible/hosts/emergency.yaml library=/usr/share/ansible log_path=/var/log/ansible/ansible.log inventory_plugins=/etc/ansible/inventory_plugins diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index 3a8a6cb062..76dc5dc182 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -11,7 +11,7 @@ include_role: name: write-inventory vars: - write_inventory_dest: /etc/ansible/hosts/inventory.yaml + write_inventory_dest: /home/zuul/src/opendev.org/opendev/system-config/inventory/base/gate-hosts.yaml write_inventory_exclude_hostvars: - ansible_user - ansible_python_interpreter @@ -27,7 +27,7 @@ path: /etc/ansible/ansible.cfg section: defaults option: inventory - value: /etc/ansible/hosts/inventory.yaml,/etc/ansible/hosts/groups.yaml,/etc/ansible/hosts/gate-groups.yaml + value: /home/zuul/src/opendev.org/opendev/system-config/inventory/base/gate-hosts.yaml,/home/zuul/src/opendev.org/opendev/system-config/inventory/service/groups.yaml,/etc/ansible/hosts/gate-groups.yaml - name: Make host_vars directory file: path: "/etc/ansible/hosts/host_vars" @@ -84,9 +84,10 @@ # In prod, bridge installs a zuul user, but in zuul we already have a zuul user, so we really need # to not modify it. + # TODO(mordred) We should be able to replace this with overriding directly. - name: Load bridge hostvars slurp: - path: /home/zuul/src/opendev.org/opendev/system-config/playbooks/host_vars/bridge.openstack.org.yaml + path: /home/zuul/src/opendev.org/opendev/system-config/inventory/service/host_vars/bridge.openstack.org.yaml register: bridge_hostvar_content - name: Parse bridge_hostvars set_fact: @@ -100,7 +101,7 @@ - name: Save bridge hostvars copy: content: "{{ bridge_hostvars | to_nice_yaml }}" - dest: /home/zuul/src/opendev.org/opendev/system-config/playbooks/host_vars/bridge.openstack.org.yaml + dest: /home/zuul/src/opendev.org/opendev/system-config/inventory/service/host_vars/bridge.openstack.org.yaml become: true - name: Run base.yaml diff --git a/testinfra/conftest.py b/testinfra/conftest.py index be545d7395..bb450b3a53 100644 --- a/testinfra/conftest.py +++ b/testinfra/conftest.py @@ -7,7 +7,7 @@ def zuul_data(): data = {} - with open('/etc/ansible/hosts/inventory.yaml') as f: + with open('/home/zuul/src/opendev.org/opendev/system-config/inventory/base/gate-hosts.yaml') as f: inventory = yaml.load(f) data['inventory'] = inventory diff --git a/tools/prep-apply.sh b/tools/prep-apply.sh index 414bda45df..ccb0857624 100644 --- a/tools/prep-apply.sh +++ b/tools/prep-apply.sh @@ -43,12 +43,23 @@ source $MODULE_ENV_FILE virtualenv --system-site-packages /tmp/apply-ansible-env /tmp/apply-ansible-env/bin/pip install ansible # Install puppet -inv=`mktemp` -cat > $inv < $ansible_root/ansible.cfg < $ROOT/inventory/base/gate-hosts < $ROOT/inventory/service/gate-groups < $ansible_root/ansible.cfg < $ansible_root/hosts < $ROOT/inventory/base/gate-hosts < $ROOT/inventory/service/gate-groups < $fileout cat $file > $fileout -export ANSIBLE_CONFIG=$ansible_root/ansible.cfg -sudo -H -E /tmp/apply-ansible-env/bin/ansible-playbook -i $ansible_root/hosts -f1 playbooks/remote_puppet_adhoc.yaml -e puppet_environment=production -e manifest=$file -e puppet_noop=true -e puppet_logdest=$fileout -e mgmt_puppet_module_dir=$MODULE_PATH +sudo -H ANSIBLE_CONFIG=$ansible_root/ansible.cfg /tmp/apply-ansible-env/bin/ansible-playbook -f1 playbooks/remote_puppet_adhoc.yaml -e puppet_environment=production -e manifest=$file -e puppet_noop=true -e puppet_logdest=$fileout -e mgmt_puppet_module_dir=$MODULE_PATH ret=$? if [ $ret -ne 0 ]; then mv $fileout $fileout.FAILED diff --git a/tox.ini b/tox.ini index 8cbe0a8a08..7224df16da 100644 --- a/tox.ini +++ b/tox.ini @@ -19,9 +19,9 @@ commands = python3 {toxinidir}/tools/sorted_modules_env.py {toxinidir}/modules.env python3 {toxinidir}/tools/irc_checks.py python3 {toxinidir}/tools/check_clouds_yaml.py - # The following command validates that inventory/openstack.yaml + # The following command validates that inventory/base/hosts.yaml # parses, but doesn't do anything. - bash -c "ANSIBLE_INVENTORY_PLUGINS=./playbooks/roles/install-ansible/files/inventory_plugins ansible -i ./inventory/openstack.yaml not_a_host -a 'true'" + bash -c "ANSIBLE_INVENTORY_PLUGINS=./playbooks/roles/install-ansible/files/inventory_plugins ansible -i ./inventory/base/hosts.yaml not_a_host -a 'true'" python3 -m unittest playbooks/roles/install-ansible/files/inventory_plugins/test_yamlgroup.py bash -c "find roles playbooks -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 ansible-lint" @@ -33,9 +33,10 @@ deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -E -b html doc/source doc/build/html [testenv:testinfra] +# This environment assumes a gate-hosts.yaml file has been written. passenv = TESTINFRA_EXTRA_DATA -commands = py.test --junit-xml junit.xml --connection=ansible --ansible-inventory=/etc/ansible/hosts/inventory.yaml -v testinfra {posargs} +commands = py.test --junit-xml junit.xml --connection=ansible --ansible-inventory=/home/zuul/src/opendev.org/opendev/system-config/inventory/base/gate-hosts.yaml -v testinfra {posargs} [flake8] show-source = True diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index 132a09df65..1b398adfb4 100644 --- a/zuul.d/infra-prod.yaml +++ b/zuul.d/infra-prod.yaml @@ -40,7 +40,7 @@ - playbooks/roles/install-ansible/ - playbooks/roles/logrotate/ - playbooks/roles/root-keys/ - - playbooks/host_vars/bridge.openstack.org.yaml + - inventory/service/host_vars/bridge.openstack.org.yaml - playbooks/zuul/run-production-playbook.yaml - job: @@ -55,8 +55,8 @@ infra_prod_ansible_forks: 50 files: - inventory/ - - playbooks/host_vars/ - - playbooks/group_vars/ + - inventory/service/host_vars/ + - inventory/service/group_vars/ - playbooks/base.yaml - playbooks/roles/base/ @@ -74,8 +74,8 @@ - playbooks/letsencrypt.yaml # Any touching of host_vars or group_vars can substantively # change the certs we're doing, so be greedy here. - - playbooks/host_vars/ - - playbooks/group_vars/ + - inventory/service/host_vars/ + - inventory/service/group_vars/ - playbooks/roles/letsencrypt - playbooks/roles/logrotate/ @@ -115,11 +115,11 @@ files: - inventory/ - playbooks/service-bridge.yaml - - playbooks/host_vars/bridge.openstack.org.yaml - - playbooks/roles/iptables/ + - inventory/service/host_vars/bridge.openstack.org.yaml - playbooks/roles/logrotate/ - playbooks/roles/edit-secrets-script/ - playbooks/roles/install-kubectl/ + - playbooks/roles/iptables/ - playbooks/roles/configure-kubectl/ - playbooks/roles/configure-openstacksdk/ - playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -133,7 +133,7 @@ files: - inventory/ - playbooks/service-gitea-lb.yaml - - playbooks/group_vars/gitea-lb.yaml + - inventory/service/group_vars/gitea-lb.yaml - playbooks/roles/pip3/ - playbooks/roles/iptables/ - playbooks/roles/install-docker/ @@ -148,11 +148,11 @@ files: - inventory/ - playbooks/service-nameserver.yaml - - playbooks/host_vars/adns1.opendev.org.yaml - - playbooks/host_vars/ns1.opendev.org.yaml - - playbooks/host_vars/ns2.opendev.org.yaml - - playbooks/group_vars/adns.yaml - - playbooks/group_vars/ns.yaml + - inventory/service/host_vars/adns1.opendev.org.yaml + - inventory/service/host_vars/ns1.opendev.org.yaml + - inventory/service/host_vars/ns2.opendev.org.yaml + - inventory/service/group_vars/adns.yaml + - inventory/service/group_vars/ns.yaml - playbooks/roles/master-nameserver/ - playbooks/roles/nameserver/ - playbooks/roles/iptables/ @@ -169,10 +169,10 @@ files: - inventory/ - playbooks/service-nodepool.yaml - - playbooks/host_vars/nb - - playbooks/host_vars/nl - - playbooks/group_vars/nodepool - - playbooks/group_vars/puppet + - inventory/service/host_vars/nb + - inventory/service/host_vars/nl + - inventory/service/group_vars/nodepool + - inventory/service/group_vars/puppet - playbooks/roles/install-ansible-roles/ - playbooks/roles/run-puppet/ - playbooks/roles/configure-kubectl/ @@ -191,8 +191,8 @@ files: - inventory/ - playbooks/service-etherpad.yaml - - playbooks/host_vars/etherpad01.opendev.org.yaml - - playbooks/group_vars/etherpad + - inventory/service/host_vars/etherpad01.opendev.org.yaml + - inventory/service/group_vars/etherpad - playbooks/roles/install-docker/ - playbooks/roles/pip3/ - playbooks/roles/etherpad @@ -215,8 +215,8 @@ files: - inventory/ - playbooks/service-meetpad.yaml - - playbooks/host_vars/meetpad01.opendev.org.yaml - - playbooks/group_vars/meetpad.yaml + - inventory/service/host_vars/meetpad01.opendev.org.yaml + - inventory/service/group_vars/meetpad.yaml - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/iptables/ @@ -246,7 +246,7 @@ files: - inventory/ - playbooks/service-mirror.yaml - - playbooks/group_vars/mirror.yaml + - inventory/service/group_vars/mirror.yaml - playbooks/roles/kerberos-client/ - playbooks/roles/openafs-client/ - playbooks/roles/mirror/ @@ -264,8 +264,8 @@ files: - inventory/ - playbooks/service-static.yaml - - playbooks/host_vars/static01.opendev.org.yaml - - playbooks/group_vars/static.yaml + - inventory/service/host_vars/static01.opendev.org.yaml + - inventory/service/group_vars/static.yaml - playbooks/roles/iptables/ - playbooks/roles/kerberos-client/ - playbooks/roles/openafs-client/ @@ -294,7 +294,7 @@ files: - inventory/ - playbooks/service-registry.yaml - - playbooks/group_vars/registry.yaml + - inventory/service/group_vars/registry.yaml - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/iptables/ @@ -309,7 +309,7 @@ files: - inventory/ - playbooks/service-zuul-preview.yaml - - playbooks/group_vars/zuul-preview.yaml + - inventory/service/group_vars/zuul-preview.yaml - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/iptables/ @@ -323,8 +323,8 @@ playbook_name: service-zookeeper.yaml files: - inventory/.* - - playbooks/group_vars/zookeeper.yaml - - ^playbooks/host_vars/zk\d+\..* + - inventory/service/group_vars/zookeeper.yaml + - ^inventory/service/host_vars/zk\d+\..* - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/iptables/ @@ -352,10 +352,10 @@ - inventory/.* - playbooks/install-ansible.yaml - playbooks/service-zuul.yaml - - playbooks/group_vars/zuul - - playbooks/group_vars/zookeeper.yaml - - playbooks/host_vars/zk\d+ - - playbooks/host_vars/zuul01.openstack.org + - inventory/service/group_vars/zuul + - inventory/service/group_vars/zookeeper.yaml + - inventory/service/host_vars/zk\d+ + - inventory/service/host_vars/zuul01.openstack.org - playbooks/roles/install-docker/ - playbooks/roles/iptables/ - playbooks/roles/zookeeper/ @@ -377,8 +377,8 @@ files: - inventory/ - playbooks/service-review.yaml - - playbooks/group_vars/gerrit.yaml - - playbooks/host_vars/review01.openstack.org.yaml + - inventory/service/group_vars/gerrit.yaml + - inventory/service/host_vars/review01.openstack.org.yaml - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/iptables/ @@ -394,8 +394,8 @@ files: - inventory/ - playbooks/service-review-dev.yaml - - playbooks/group_vars/gerrit.yaml - - playbooks/host_vars/review-dev01.opendev.org.yaml + - inventory/service/group_vars/gerrit.yaml + - inventory/service/host_vars/review-dev01.opendev.org.yaml - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/iptables/ @@ -419,8 +419,8 @@ files: - inventory/ - playbooks/service-gitea.yaml - - playbooks/group_vars/gitea.yaml - - playbooks/host_vars/gitea[0-9][0-9] + - inventory/service/group_vars/gitea.yaml + - inventory/service/host_vars/gitea[0-9][0-9] - playbooks/roles/install-docker/ - playbooks/roles/pip3/ - playbooks/roles/gitea/ @@ -445,7 +445,7 @@ - inventory/ - playbooks/install-ansible.yaml - playbooks/service-codesearch.yaml - - playbooks/group_vars/puppet.yaml + - inventory/service/group_vars/puppet.yaml - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/iptables/ @@ -477,8 +477,8 @@ - inventory/ - playbooks/service-eavesdrop.yaml - playbooks/run-accessbot.yaml - - playbooks/group_vars/eavesdrop.yaml - - playbooks/group_vars/puppet.yaml + - inventory/service/group_vars/eavesdrop.yaml + - inventory/service/group_vars/puppet.yaml - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/zuul-user @@ -524,9 +524,9 @@ files: - inventory/ - playbooks/remote_puppet_afs.yaml - - playbooks/group_vars/afs - - playbooks/group_vars/mirror-update - - playbooks/group_vars/puppet + - inventory/service/group_vars/afs + - inventory/service/group_vars/mirror-update + - inventory/service/group_vars/puppet - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/puppet-install/ @@ -550,9 +550,9 @@ - hiera/ - inventory/ - playbooks/remote_puppet_else.yaml - - playbooks/group_vars/ - - playbooks/host_vars/ - - playbooks/group_vars/puppet + - inventory/service/group_vars/ + - inventory/service/host_vars/ + - inventory/service/group_vars/puppet - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/puppet-install/ @@ -576,4 +576,4 @@ soft: true files: - playbooks/run_cloud_launcher.yaml - - playbooks/host_vars/bridge.openstack.org.yaml + - inventory/service/host_vars/bridge.openstack.org.yaml diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 3a03fda921..045404aa53 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -184,10 +184,10 @@ files: - inventory/.* - playbooks/manage-projects.yaml - - playbooks/group_vars/gerrit.yaml - - playbooks/group_vars/gitea.yaml - - playbooks/host_vars/gitea - - playbooks/host_vars/review + - inventory/service/group_vars/gerrit.yaml + - inventory/service/group_vars/gitea.yaml + - inventory/service/host_vars/gitea + - inventory/service/host_vars/review - playbooks/roles/gitea-git-repos/ - playbooks/roles/gerrit/defaults/main.yaml - playbooks/roles/gerrit/tasks/manage-projects.yaml diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 67976211a7..d67b6a7223 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -127,8 +127,8 @@ files: - playbooks/service-eavesdrop.yaml - playbooks/run-accessbot.yaml - - playbooks/group_vars/eavesdrop.yaml - - playbooks/group_vars/puppet.yaml + - inventory/service/group_vars/eavesdrop.yaml + - inventory/service/group_vars/puppet.yaml - playbooks/roles/zuul-user - playbooks/roles/install-docker - playbooks/roles/puppet-install/ @@ -158,7 +158,7 @@ files: - playbooks/install-ansible.yaml - playbooks/service-codesearch.yaml - - playbooks/group_vars/puppet.yaml + - inventory/service/group_vars/puppet.yaml - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/sync-project-config @@ -202,7 +202,7 @@ '/var/log/acme.sh': logs files: - playbooks/install-ansible.yaml - - playbooks/group_vars/letsencrypt.yaml + - inventory/service/group_vars/letsencrypt.yaml - playbooks/roles/letsencrypt - job: @@ -222,8 +222,8 @@ files: - playbooks/install-ansible.yaml - modules/openstack_project/manifests/lists.pp - - playbooks/host_vars/lists.openstack.org.yaml - - playbooks/group_vars/puppet + - inventory/service/host_vars/lists.openstack.org.yaml + - inventory/service/group_vars/puppet - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/base/exim @@ -268,10 +268,10 @@ - playbooks/remote_puppet_else.yaml files: - playbooks/install-ansible.yaml - - playbooks/group_vars/nodepool.yaml - - playbooks/group_vars/nodepool-builder.yaml - - playbooks/group_vars/nodepool-launcher.yaml - - playbooks/group_vars/puppet + - inventory/service/group_vars/nodepool.yaml + - inventory/service/group_vars/nodepool-builder.yaml + - inventory/service/group_vars/nodepool-launcher.yaml + - inventory/service/group_vars/puppet - playbooks/roles/run-puppet/ - playbooks/roles/install-ansible-roles/ - playbooks/roles/configure-openstacksdk/ @@ -305,9 +305,9 @@ '/var/lib/bind/zones': logs files: - playbooks/install-ansible.yaml - - playbooks/group_vars/adns.yaml - - playbooks/group_vars/dns.yaml - - playbooks/host_vars/(ad)?ns\d+.opendev.org.yaml + - inventory/service/group_vars/adns.yaml + - inventory/service/group_vars/dns.yaml + - inventory/service/host_vars/(ad)?ns\d+.opendev.org.yaml - playbooks/zuul/templates/group_vars/adns.yaml.j2 - playbooks/zuul/templates/group_vars/ns.yaml.j2 - playbooks/roles/master-nameserver/ @@ -363,7 +363,7 @@ files: - playbooks/install-ansible.yaml - roles/ - - playbooks/group_vars/mirror.yaml + - inventory/service/group_vars/mirror.yaml - playbooks/roles/mirror/ - playbooks/roles/letsencrypt - playbooks/letsencrypt.yaml @@ -438,8 +438,8 @@ '/var/registry/certs': logs files: - playbooks/install-ansible.yaml - - playbooks/group_vars/registry.yaml - - playbooks/host_vars/insecure-ci-registry\d+.opendev.org.yaml + - inventory/service/group_vars/registry.yaml + - inventory/service/host_vars/insecure-ci-registry\d+.opendev.org.yaml - playbooks/zuul/templates/group_vars/registry.yaml.j2 - playbooks/roles/letsencrypt-create-certs/handlers/restart_zuul_registry.yaml - playbooks/roles/registry/ @@ -513,9 +513,9 @@ - playbooks/service-gitea.yaml - playbooks/manage-projects.yaml - playbooks/test-gitea.yaml - - playbooks/group_vars/gitea.yaml - - playbooks/group_vars/gitea-lb.yaml - - playbooks/host_vars/gitea + - inventory/service/group_vars/gitea.yaml + - inventory/service/group_vars/gitea-lb.yaml + - inventory/service/host_vars/gitea - playbooks/zuul/templates/group_vars/gitea.yaml.j2 - playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2 - playbooks/roles/pip3/ @@ -562,8 +562,8 @@ '/var/jitsi-meet': logs files: - playbooks/install-ansible.yaml - - playbooks/group_vars/meetpad.yaml - - playbooks/host_vars/meetpad\d+.opendev.org.yaml + - inventory/service/group_vars/meetpad.yaml + - inventory/service/host_vars/meetpad\d+.opendev.org.yaml - playbooks/roles/letsencrypt-create-certs/handlers/restart_jitsi_meet.yaml - playbooks/roles/jitsi-meet/ - playbooks/roles/pip3/ @@ -588,8 +588,8 @@ - playbooks/service-zookeeper.yaml files: - playbooks/install-ansible.yaml - - playbooks/group_vars/zookeeper.yaml - - ^playbooks/host_vars/zk\d+\..* + - inventory/service/group_vars/zookeeper.yaml + - ^inventory/service/host_vars/zk\d+\..* - playbooks/roles/zookeeper/ - playbooks/roles/pip3/ - playbooks/roles/install-docker/ @@ -665,10 +665,10 @@ - playbooks/install-ansible.yaml - playbooks/service-zookeeper.yaml - playbooks/service-zuul.yaml - - playbooks/group_vars/zuul - - playbooks/group_vars/zookeeper.yaml - - playbooks/host_vars/zk\d+ - - playbooks/host_vars/zuul01.openstack.org + - inventory/service/group_vars/zuul + - inventory/service/group_vars/zookeeper.yaml + - inventory/service/host_vars/zk\d+ + - inventory/service/host_vars/zuul01.openstack.org - playbooks/roles/zookeeper/ - playbooks/roles/install-apt-repo - playbooks/roles/zuul @@ -712,10 +712,10 @@ - playbooks/install-ansible.yaml - playbooks/letsencrypt.yaml - playbooks/service-review.*.yaml - - playbooks/group_vars/review.yaml - - playbooks/host_vars/review\d+.openstack.org.yaml - - playbooks/group_vars/review-dev.yaml - - playbooks/host_vars/review-dev\d+.opendev.org.yaml + - inventory/service/group_vars/review.yaml + - inventory/service/host_vars/review\d+.openstack.org.yaml + - inventory/service/group_vars/review-dev.yaml + - inventory/service/host_vars/review-dev\d+.opendev.org.yaml - playbooks/roles/pip3/ - playbooks/roles/install-docker/ - playbooks/roles/letsencrypt