From 88df0abd2d6e3778ab5f000dc4bf84e6ac863eab Mon Sep 17 00:00:00 2001 From: "Donovan Francesco (IS)" Date: Thu, 25 Aug 2016 14:59:31 +0200 Subject: [PATCH] Updates --- README.rst | 2 +- doc/Makefile | 8 ++++---- doc/source/conf.py | 2 +- meta/main.yml | 4 ++-- releasenotes/source/conf.py | 2 +- vars/ubuntu-14.04.yml | 3 --- vars/ubuntu-16.04.yml | 3 --- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index 862ca66..68c94bc 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -OpenStack-Ansible trove +OpenStack-Ansible Trove (DBaaS) ############################### Ansible role that installs and configures OpenStack Trove. Trove is diff --git a/doc/Makefile b/doc/Makefile index a8fbef2..a8836c4 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-os_elasticsearch.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/openstack-ansible-os_trove.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/openstack-ansible-os_elasticsearch.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/openstack-ansible-os_trove.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-os_elasticsearch" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/openstack-ansible-os_elasticsearch" + @echo "# mkdir -p $$HOME/.local/share/devhelp/openstack-ansible-os_trove" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/openstack-ansible-os_trove" @echo "# devhelp" epub: diff --git a/doc/source/conf.py b/doc/source/conf.py index f1e6250..b640a58 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -62,7 +62,7 @@ category = 'Miscellaneous' copyright = '2014-2016, OpenStack-Ansible Contributors' description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.' project = 'OpenStack-Ansible' -role_name = 'os_elasticsearch' +role_name = 'os_trove' target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' diff --git a/meta/main.yml b/meta/main.yml index 02bc599..20c6531 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,7 @@ --- galaxy_info: author: Donovan Francesco - description: Deploy Elasticsearch with OpenStack Ansible + description: Deploy Trove with OpenStack Ansible company: OpenStack license: Apache-2.0 min_ansible_version: 1.9 @@ -15,6 +15,6 @@ galaxy_info: - cloud - openstack - python - - elasticsearch + - trove dependencies: [] diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 3cc8994..538453e 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -60,7 +60,7 @@ category = 'Miscellaneous' copyright = '2014-2016, OpenStack-Ansible Contributors' description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.' project = 'OpenStack-Ansible' -role_name = 'os_elasticsearch' +role_name = 'os_trove' target_name = 'openstack-ansible-' + role_name title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role' diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index 8d631ac..1b03aba 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -15,9 +15,6 @@ # # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens -# -# Originally obtained from https://github.com/elastic/ansible-trove -# cache_timeout: 600 trove_apt_packages: diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index 8d631ac..1b03aba 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -15,9 +15,6 @@ # # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens -# -# Originally obtained from https://github.com/elastic/ansible-trove -# cache_timeout: 600 trove_apt_packages: