Finalize the move from openstack-chef-repo to openstack-chef

Change-Id: Ie97fe2af2a068f5c4a970fb45f24c162b705860c

.gitreview

@@ -1,5 +1,5 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack/openstack-chef-repo.git
+project=openstack/openstack-chef.git
 defaultbranch=stable/queens

.zuul.yaml

@@ -1,33 +1,34 @@
 - job:
-    name: openstack-chef-repo-delivery
+    name: openstack-chef-delivery
     parent: base
-    description: Run Chef Delivery tests with openstack-chef-repo
-    required-projects: openstack/openstack-chef-repo
+    description: Run Chef Delivery tests with openstack-chef
+    required-projects: openstack/openstack-chef
     pre-run: playbooks/pre.yaml
     run: playbooks/delivery.yaml
     timeout: 2700
 
 - job:
-    name: openstack-chef-repo-integration
+    name: openstack-chef-integration
     parent: base
-    description: Run integration tests with openstack-chef-repo
-    required-projects: openstack/openstack-chef-repo
+    description: Run integration tests with openstack-chef
+    required-projects: openstack/openstack-chef
     pre-run: playbooks/pre.yaml
     run: playbooks/integration.yaml
     post-run: playbooks/post.yaml
     timeout: 3600
 
 - project-template:
-    name: openstack-chef-repo-jobs
+    name: openstack-chef-jobs
     check:
       jobs:
-        - openstack-chef-repo-delivery
-        - openstack-chef-repo-integration
+        - openstack-chef-delivery
+        - openstack-chef-integration
     gate:
       jobs:
-        - openstack-chef-repo-delivery
-        - openstack-chef-repo-integration
+        - openstack-chef-delivery
+        - openstack-chef-integration
 
 - project:
     templates:
-      - openstack-chef-repo-jobs
+      - build-openstack-sphinx-docs-python3
+      - openstack-chef-jobs

README.md

@@ -1,7 +1,7 @@
 Team and repository tags
 ========================
 
-[![Team and repository tags](http://governance.openstack.org/badges/openstack-chef-repo.svg)](http://governance.openstack.org/reference/tags/index.html)
+[![Team and repository tags](http://governance.openstack.org/badges/openstack-chef.svg)](http://governance.openstack.org/reference/tags/index.html)
 
 <!-- Change things from this point on -->
 
@@ -22,8 +22,7 @@ With the `master` branch of the cookbooks, which is currently tied to the base
 OpenStack Ocata release, this supports deploying to Ubuntu 16.04 and CentOS 7
 in monolithic, or allinone, and non-HA multinode configurations with Neutron.
 The cookbooks support a fully HA configuration, but we do not test for that as
-there are far numerous paths to
-HA.
+there are far numerous paths to HA.
 
 ## Prerequisites
 
@@ -34,8 +33,8 @@ HA.
 ### Getting the Code (this repo)
 
 ```shell
-$ git clone https://github.com/openstack/openstack-chef-repo.git
-$ cd openstack-chef-repo
+$ git clone https://github.com/openstack/openstack-chef.git
+$ cd openstack-chef
 ```
 
 The OpenStack cookbooks by default use encrypted data bags for configuring

doc/source/conf.py

@@ -17,7 +17,7 @@ import sys
 import openstackdocstheme
 
 # -- Chef OpenStack configuration --------------------------------------------
-target_name = 'chef-openstack-docs'
+target_name = 'openstack-chef'
 description = 'Chef OpenStack uses Chef to deploy OpenStack environments.'
 previous_series_name = 'pike'
 current_series_name = 'queens'
@@ -29,34 +29,6 @@ category = 'Miscellaneous'
 copyright = u'2014-2018, Chef OpenStack Contributors'
 author = u'Chef OpenStack Contributors'
 
-current_series = openstackdocstheme.ext._get_series_name()
-
-if current_series == "latest":
-  watermark = "Pre-release"
-  latest_tag = "master"
-  branch = "master"
-  upgrade_warning = "Upgrading to master is not recommended. Master is under heavy development, and is not stable."
-else:
-  watermark = series_names = current_series.capitalize()
-  latest_tag = os.popen('git describe --abbrev=0 --tags').read().strip('\n')
-  branch = "stable/{}".format(current_series)
-  upgrade_warning = "The upgrade is always under active development."
-
-# Substitutions loader
-rst_epilog = """
-.. |current_release_git_branch_name| replace:: {current_release_git_branch_name}
-.. |previous_release_formal_name| replace:: {previous_release_formal_name}
-.. |current_release_formal_name| replace:: {current_release_formal_name}
-.. |latest_tag| replace:: {latest_tag}
-.. |upgrade_warning| replace:: {upgrade_warning}
-""".format(
-  current_release_git_branch_name=branch,
-  previous_release_formal_name=previous_series_name.capitalize(),
-  current_release_formal_name=current_series_name.capitalize(),
-  latest_tag=latest_tag,
-  upgrade_warning=upgrade_warning,
-)
-
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -86,7 +58,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # openstackdocstheme options
-repository_name = 'openstack/openstack-chef-repo'
+repository_name = 'openstack/openstack-chef'
 bug_project = 'openstack-chef'
 bug_tag = ''
 
@@ -146,7 +118,7 @@ html_last_updated_fmt = '%Y-%m-%d %H:%M'
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'chef-openstack-docs'
+htmlhelp_basename = target_name + '-docs'
 
 # If true, publish source files
 html_copy_source = False
@@ -206,12 +178,3 @@ pdf_documents = [
     (master_doc, target_name,
      title, author)
 ]
-
-# -- Options for sphinxmark -----------------------------------------------
-sphinxmark_enable = True
-sphinxmark_div = 'docs-body'
-sphinxmark_image = 'text'
-sphinxmark_text = watermark
-sphinxmark_text_color = (128, 128, 128)
-sphinxmark_text_size = 70
-

doc/source/contributor/ci.rst

@@ -6,7 +6,7 @@ Continuous Integration
 
 This is a list of the CI jobs that are running against most of the Chef
 OpenStack cookbooks. The code that configures Zuul jobs is hosted in
-`openstack-chef-repo <https://git.openstack.org/cgit/openstack/openstack-chef-repo/tree/playbooks/>`_.
+`openstack-chef <https://git.openstack.org/cgit/openstack/openstack-chef/tree/playbooks/>`_.
 
 .. list-table:: **CI Jobs in Chef OpenStack**
    :widths: 31 25 8 55
@@ -16,11 +16,11 @@ OpenStack cookbooks. The code that configures Zuul jobs is hosted in
      - Description
      - Voting
      - If it fails
-   * - openstack-chef-repo-rake
+   * - openstack-chef-rake
      - It ensures the code follows the `Chef style guidelines <https://docs.chef.io/ruby.html>`_.
      - Yes
      - Read the build logs to see which part of the code does not follow the recommended patterns.
-   * - openstack-chef-repo-integration
+   * - openstack-chef-integration
      - Functional testing job that converges OpenStack, testing using Tempest.
      - Yes
      - Read the build logs to see where the failure originated.

doc/source/install/quickstart.rst

@@ -1,14 +1,14 @@
 .. _quickstart-test-kitchen:
 
-`Test Kitchen`_ is a no-fuss, no BS way to get a Chef OpenStack build for:
+`Kitchen`_ is a no-fuss, no BS way to get a Chef OpenStack build for:
 
 * development of OpenStack or applications on top of it
 * a reference for how the services fit together
 * a simple lab environment
 
-.. _Test Kitchen: https://kitchen.ci/
+.. _Kitchen: https://kitchen.ci/
 
-Test Kitchen builds are not recommended for production deployments, but they can work in
+Kitchen builds are not recommended for production deployments, but they can work in
 a pinch when you just need OpenStack.
 
 At an absolute minimum, you should use the following resources. What is listed
@@ -62,9 +62,9 @@ Start by cloing the OpenStack chef-repo repository and changing into the root di
 
 .. code-block:: shell-session
 
-  # git clone https://git.openstack.org/openstack/openstack-chef-repo \
-      /opt/openstack-chef-repo
-  # cd openstack-chef-repo
+  # git clone https://git.openstack.org/openstack/openstack-chef \
+      /opt/openstack-chef
+  # cd openstack-chef
 
 Next, switch to the applicable branch/tag to be deployed. Note that deploying
 from the head of a branch may result in an unstable build due to changes in
@@ -77,10 +77,10 @@ is usually best to checkout the latest tagged version.
    # git branch -v
 
    ## Checkout the stable branch
-   # git checkout |current_release_git_branch_name|
+   # git checkout stable/queens
 
 .. note::
-   The |current_release_formal_name| release is compatible with Ubuntu 16.04
+   The Queens release is compatible with Ubuntu 16.04
    (Xenial Xerus) and CentOS 7
 
 By default the cookbooks deploy all OpenStack services with sensible defaults

doc/source/install/supported-platforms.rst

@@ -12,5 +12,5 @@ the `Chef Development Kit <https://docs.chef.io/about_chefdk.html>`_.
 Your success rate may vary with the bleeding edge. Chef 12 and older is NOT
 supported.
 
-See `Chef CI <http://docs.openstack.org/developer/chef-openstack-guide/ci.html>`_
+See `Chef CI <http://docs.openstack.org/openstack-chef/queens/contributor/ci.html>`_
 to see what is currently tested.

playbooks/integration.yaml

@@ -3,6 +3,6 @@
     - name: run integration
       shell:
         cmd: chef exec rake integration
-        chdir: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/openstack-chef-repo'
+        chdir: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/openstack-chef'
       environment:
         WORKSPACE: '{{ ansible_user_dir }}'

playbooks/pre.yaml

@@ -2,7 +2,7 @@
   roles:
     - bindep
   vars:
-    bindep_file: /home/zuul/src/git.openstack.org/openstack/openstack-chef-repo/bindep.txt
+    bindep_file: /home/zuul/src/git.openstack.org/openstack/openstack-chef/bindep.txt
 
 - hosts: all
   vars:

setup.cfg

@@ -1,11 +1,11 @@
 [metadata]
-name = chef-openstack
+name = openstack-chef
 summary = Chef cookbooks for deploying OpenStack
 description-file =
     README.md
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = https://docs.openstack.org/chef-openstack/latest/
+home-page = https://docs.openstack.org/openstack-chef/latest/
 classifier =
     Intended Audience :: Developers
     Intended Audience :: System Administrators
@@ -16,6 +16,7 @@ classifier =
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source
+warning-is-error = 1
 
 [pbr]
 warnerrors = True

test/tempest/default/default_test.rb

@@ -1,6 +1,6 @@
 # # encoding: utf-8
 
-# Inspec test for openstack-chef-repo
+# Inspec test for openstack-chef
 
 # The Inspec reference, with examples and extensive documentation, can be
 # found at http://inspec.io/docs/reference/resources/

tools/test_patch.rb

@@ -165,8 +165,8 @@ LONGDESC
         end
       end
 
-      run('git clone --depth 1 git@github.com:openstack/openstack-chef-repo.git') unless options[:skip]
-      Dir.chdir('openstack-chef-repo') do
+      run('git clone --depth 1 git@github.com:openstack/openstack-chef.git') unless options[:skip]
+      Dir.chdir('openstack-chef') do
         ENV['ZUUL_CHANGES'] = options[:patches]
         run('chef exec rake berks_vendor') unless options[:skip]