Rename stackforge/os-ansible-deployment{,specs}

In Id3f6175fcdd4a21019eabca56cd337145ff9c2b0 os-ansible-deployment moved
into the openstack namespace and was renamed to
openstack/openstack-ansible. It's specs repository will also be renamed
to openstack/openstack-ansible-specs.

This also switches the publishing of documentation from readthedocs to
docs.openstack.org and includes both doc and spec publishing.

Change-Id: I10588f1118f21793ef9a1a647184cf2e8de07260

gerrit/acls/openstack/openstack-ansible.config

@@ -0,0 +1,22 @@
+[access "refs/heads/*"]
+abandon = group openstack-ansible-core
+create = group openstack-ansible-release
+label-Code-Review = -2..+2 group openstack-ansible-core
+label-Workflow = -1..+1 group openstack-ansible-core
+
+[access "refs/heads/proposed/*"]
+abandon = group openstack-ansible-core
+exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
+label-Code-Review = -2..+2 group openstack-ansible-core
+label-Code-Review = -1..+1 group Registered Users
+label-Workflow = -1..+1 group openstack-ansible-core
+
+[access "refs/tags/*"]
+pushSignedTag = group openstack-ansible-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true

gerrit/acls/stackforge/os-ansible-deployment.config

@@ -1,22 +0,0 @@
-[access "refs/heads/*"]
-abandon = group os-ansible-deployment-core
-create = group os-ansible-deployment-release
-label-Code-Review = -2..+2 group os-ansible-deployment-core
-label-Workflow = -1..+1 group os-ansible-deployment-core
-
-[access "refs/heads/proposed/*"]
-abandon = group os-ansible-deployment-core
-exclusiveGroupPermissions = abandon label-Code-Review label-Workflow
-label-Code-Review = -2..+2 group os-ansible-deployment-core
-label-Code-Review = -1..+1 group Registered Users
-label-Workflow = -1..+1 group os-ansible-deployment-core
-
-[access "refs/tags/*"]
-pushSignedTag = group os-ansible-deployment-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true

gerrit/projects.yaml

@@ -1248,6 +1248,16 @@
     Service (LBaaS)
 - project: openstack/openstack
   description: Repository containing OpenStack repositories
+- project: openstack/openstack-ansible
+  description: Ansible playbooks for deploying OpenStack.
+  groups:
+    - openstack-ansible
+  docimpact-group: openstack-ansible
+- project: openstack/openstack-ansible-specs
+  description: Design Specifications for OpenStack-Ansible
+  groups:
+    - openstack-ansible
+  acl-config: /home/gerrit2/acls/openstack/openstack-ansible.config
 - project: openstack/openstack-chef-repo
   groups:
     - openstack-chef
@@ -2516,16 +2526,6 @@
   description: OpenVz driver for Nova
 - project: stackforge/ops-tags-team
   description: Work of the User Committee's Ops Tags Team.
-- project: stackforge/os-ansible-deployment
-  description: Ansible playbooks for deploying OpenStack.
-  groups:
-    - openstack-ansible
-  docimpact-group: openstack-ansible
-- project: stackforge/os-ansible-deployment-specs
-  description: Design Specifications for os-ansible-deployment
-  groups:
-    - openstack-ansible
-  acl-config: /home/gerrit2/acls/stackforge/os-ansible-deployment.config
 - project: stackforge/osprofiler
   description: OpenStack cross service/project profiler
 - project: stackforge/ospurge

gerritbot/channels.yaml

@@ -225,8 +225,8 @@ openstack-ansible:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/os-ansible-deployment
-      - stackforge/os-ansible-deployment-specs
+      - openstack/openstack-ansible
+      - openstack/openstack-ansible-specs
     branches:
       - master
       - icehouse

jenkins/jobs/projects.yaml

@@ -2419,6 +2419,29 @@
       - pypi-jobs
       - openstack-publish-jobs
 
+- project:
+    name: openstack-ansible
+    node: 'bare-precise || bare-trusty'
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - openstack-publish-jobs
+      - 'gate-{name}-docs'
+      - 'gate-{name}-lint'
+      - 'gate-{name}-dsvm-commit{branch-designator}':
+          node: 'devstack-trusty'
+          branch-designator: ''
+      - 'gate-{name}-dsvm-commit{branch-designator}':
+          node: 'ubuntu-trusty'
+          branch-designator: '-nv'
+
+- project:
+    name: openstack-ansible-specs
+    node: 'bare-precise || bare-trusty'
+
+    jobs:
+      - specs-jobs
+
 - project:
     name: openstack-chef-repo
     node: 'bare-precise || bare-trusty'
@@ -5769,28 +5792,6 @@
     jobs:
       - gate-{name}-pep8
 
-- project:
-    name: os-ansible-deployment
-    node: 'bare-precise || bare-trusty'
-
-    jobs:
-      - 'gate-{name}-docs'
-      - 'gate-{name}-lint'
-      - 'gate-{name}-dsvm-commit{branch-designator}':
-          node: 'devstack-trusty'
-          branch-designator: ''
-      - 'gate-{name}-dsvm-commit{branch-designator}':
-          node: 'ubuntu-trusty'
-          branch-designator: '-nv'
-      - hook-{name}-rtfd
-
-- project:
-    name: os-ansible-deployment-specs
-    node: 'bare-precise || bare-trusty'
-
-    jobs:
-      - specs-jobs
-
 - project:
     name: osprofiler
     node: 'bare-precise || bare-trusty'

zuul/layout.yaml

@@ -1663,10 +1663,10 @@ jobs:
   - name: gate-glance-python34
     branch: ^(?!stable/(?:juno|kilo)).*$
 
-  # os-ansible-deployment skip for rst/doc files
-  - name: ^gate-os-ansible-deployment-(dsvm-commit|lint)$
+  # openstack-ansible skip for rst/doc files
+  - name: ^gate-openstack-ansible-(dsvm-commit|lint)$
     skip-if:
-      - project: ^stackforge/os-ansible-deployment$
+      - project: ^openstack/openstack-ansible$
         all-files-match-any:
           - ^.*\.rst$
           - ^doc/.*
@@ -4318,6 +4318,27 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
+  # note that these jobs use an in-repo script for execution
+  # in order to cater for differing requirements per branch
+  - name: openstack/openstack-ansible
+    template:
+      - name: merge-check
+      - name: openstack-server-publish-jobs
+    check:
+      - gate-openstack-ansible-docs
+      - gate-openstack-ansible-lint
+      - gate-openstack-ansible-dsvm-commit
+    experimental:
+      - gate-openstack-ansible-dsvm-commit-nv
+    gate:
+      - gate-openstack-ansible-docs
+      - gate-openstack-ansible-dsvm-commit
+
+  - name: openstack/openstack-ansible-specs
+    template:
+      - name: merge-check
+      - name: openstack-specs-jobs
+
   - name: openstack/openstack-chef-repo
     template:
       - name: merge-check
@@ -8044,27 +8065,6 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
-  # note that these jobs use an in-repo script for execution
-  # in order to cater for differing requirements per branch
-  - name: stackforge/os-ansible-deployment
-    template:
-      - name: merge-check
-      - name: docs-on-rtfd
-    check:
-      - gate-os-ansible-deployment-docs
-      - gate-os-ansible-deployment-lint
-      - gate-os-ansible-deployment-dsvm-commit
-    experimental:
-      - gate-os-ansible-deployment-dsvm-commit-nv
-    gate:
-      - gate-os-ansible-deployment-docs
-      - gate-os-ansible-deployment-dsvm-commit
-
-  - name: stackforge/os-ansible-deployment-specs
-    template:
-      - name: merge-check
-      - name: stackforge-specs-jobs
-
   - name: stackforge/osprofiler
     template:
       - name: merge-check

zuul/openstack_functions.py

@@ -100,7 +100,7 @@ def set_node_options(item, job, params, default):
     f21_re = r'^.*-f21.*$'
     tripleo_re = r'^.*-tripleo.*$'
     kolla_image_re = r'^.*-kolla-build-images-.*$'
-    openstack_ansible_re = r'^.*-(os-ansible-deployment|openstack-ansible)-.*$'
+    openstack_ansible_re = r'^.*-openstack-ansible-.*$'
     devstack_re = r'^.*-dsvm.*$'
     puppetunit_re = (
         r'^gate-(puppet-.*|system-config)-puppet-(lint|syntax|unit).*$')