From b5cf284ede34417367ed7b44eae4d1c791072854 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 8 Dec 2015 14:23:59 -0600 Subject: [PATCH] Updates for typos This change updates a few things that were missed when the role was cut over. Change-Id: I38824f82f884958b554b1618fc059a67a03aabdc Signed-off-by: Kevin Carter --- doc/Makefile | 8 ++++---- doc/source/conf.py | 28 ++++++++++++++-------------- setup.cfg | 4 ++-- tests/ansible-role-requirements.yml | 6 ++++-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 4558cd5f..66267ec6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -87,9 +87,9 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/openstack-ansible-apt_package_pinning.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/openstack-ansible-lxc_hosts.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/openstack-ansible-apt_package_pinning.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/openstack-ansible-lxc_hosts.qhc" applehelp: $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp @@ -104,8 +104,8 @@ devhelp: @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/openstack-ansible-apt_package_pinning" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/openstack-ansible-apt_package_pinning" + @echo "# mkdir -p $$HOME/.local/share/devhelp/openstack-ansible-lxc_hosts" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/openstack-ansible-lxc_hosts" @echo "# devhelp" epub: diff --git a/doc/source/conf.py b/doc/source/conf.py index 84882b02..b2c02533 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # -# openstack-ansible-apt_package_pinning documentation build configuration file, created by +# openstack-ansible-lxc_hosts documentation build configuration file, created by # sphinx-quickstart on Mon Apr 13 20:42:26 2015. # # This file is execfile()d with the current directory set to its @@ -32,7 +32,7 @@ extensions = [ ] # The link to the browsable source code (for the left hand menu) -oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/openstack-ansible-apt_package_pinning' +oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/openstack-ansible-lxc_hosts' # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -49,9 +49,9 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'openstack-ansible-apt_package_pinning' -copyright = '2015, openstack-ansible-apt_package_pinning contributors' -author = 'openstack-ansible-apt_package_pinning contributors' +project = 'openstack-ansible-lxc_hosts' +copyright = '2015, openstack-ansible-lxc_hosts contributors' +author = 'openstack-ansible-lxc_hosts contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -203,7 +203,7 @@ html_static_path = ['_static'] # html_search_scorer = 'scorer.js' # Output file base name for HTML help builder. -htmlhelp_basename = 'openstack-ansible-apt_package_pinningdoc' +htmlhelp_basename = 'openstack-ansible-lxc_hostsdoc' # -- Options for LaTeX output --------------------------------------------- @@ -225,9 +225,9 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'openstack-ansible-apt_package_pinning.tex', - 'openstack-ansible-apt_package_pinning Documentation', - 'openstack-ansible-apt_package_pinning contributors', 'manual'), + (master_doc, 'openstack-ansible-lxc_hosts.tex', + 'openstack-ansible-lxc_hosts Documentation', + 'openstack-ansible-lxc_hosts contributors', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -256,8 +256,8 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'openstack-ansible-apt_package_pinning', - 'openstack-ansible-apt_package_pinning Documentation', + (master_doc, 'openstack-ansible-lxc_hosts', + 'openstack-ansible-lxc_hosts Documentation', [author], 1) ] @@ -271,9 +271,9 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'openstack-ansible-apt_package_pinning', - 'openstack-ansible-apt_package_pinning Documentation', - author, 'openstack-ansible-apt_package_pinning', 'One line description of project.', + (master_doc, 'openstack-ansible-lxc_hosts', + 'openstack-ansible-lxc_hosts Documentation', + author, 'openstack-ansible-lxc_hosts', 'One line description of project.', 'Miscellaneous'), ] diff --git a/setup.cfg b/setup.cfg index 9cac47b0..6bea8184 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] -name = openstack-ansible-apt_package_pinning -summary = APT package pinning for OpenStack Ansible +name = openstack-ansible-lxc_hosts +summary = Role for setting up LXC Hosts description-file = README.rst author = OpenStack diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 509e662f..3575966d 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,6 +1,8 @@ - name: apt_package_pinning - src: https://github.com/os-cloud/openstack-ansible-apt_package_pinning + src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + scm: git version: master - name: pip_install - src: https://github.com/os-cloud/openstack-ansible-pip_install + src: https://git.openstack.org/openstack/openstack-ansible-pip_install + scm: git version: master