From 20507623d0771c9e9750063ce7c40ee7ff02eee5 Mon Sep 17 00:00:00 2001 From: Raoul Scarazzini Date: Wed, 23 May 2018 17:05:32 +0200 Subject: [PATCH] Fix the last old repository references This patch fixes the latest references that are around and refer to the old repository name (tripleo-quickstart-utils), changing it into the new tripleo-ha-utils. Change-Id: I426387486b832314882a3094966e4f2806218331 --- README.md | 12 +++++------ infrared/README.md | 20 +++++++++---------- infrared/infrared_instance-ha_plugin_main.yml | 6 +++--- rally/README.md | 4 ++-- setup.cfg | 6 +++--- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index bcfc490..29e7b89 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ The playbooks can be launched directly from the **undercloud** machine of the **TripleO** deployment. The described steps are expected to be run inside the */home/stack* directory. -First of all a clone of the *tripleo-quickstart-utils* repository must be +First of all a clone of the *tripleo-ha-utils* repository must be created: - git clone https://github.com/redhat-openstack/tripleo-quickstart-utils + git clone https://github.com/openstack/tripleo-ha-utils then three environment variables needs to be exported, pointing three files: @@ -33,7 +33,7 @@ These files are: **ansible.cfg** which must contain at least these lines: [defaults] - roles_path = /home/stack/tripleo-quickstart-utils/roles + roles_path = /home/stack/tripleo-ha-utils/roles **hosts** which must be configured depending on the deployed environment, reflecting these sections: @@ -90,17 +90,17 @@ In this example to connect to overcloud-controller-0 ansible will use With this setup in place is then possible to launch the playbook: - ansible-playbook /home/stack/tripleo-quickstart-utils/playbooks/overcloud-instance-ha.yml -e release=newton + ansible-playbook /home/stack/tripleo-ha-utils/playbooks/overcloud-instance-ha.yml -e release=newton Using the playbooks on tripleo-quickstart provided environment -------------------------------------------------------------- -*tripleo-quickstart-utils* project can be set as a *tripleo-quickstart* +*tripleo-ha-utils* project can be set as a *tripleo-quickstart* extra requirement, so all the code will be automatically downloaded and available. Inside the requirements.txt file you will need a line pointing to this repo: - echo "https://gituhb.com/openstack/tripleo-quickstart-utils/#egg=tripleo-quickstart-utils" >> tripleo-quickstart/quickstart-extras-requirements.txt + echo "https://github.com/openstack/tripleo-ha-utils/#egg=tripleo-ha-utils" >> tripleo-quickstart/quickstart-extras-requirements.txt Supposing the environment was successfully provided with a previous quickstart execution, to use one of the utils playbook a command line like this one can be diff --git a/infrared/README.md b/infrared/README.md index 3eade8b..53d40fa 100644 --- a/infrared/README.md +++ b/infrared/README.md @@ -4,30 +4,30 @@ Infrared Intance-ha Plugin Playbook This Plugin deploys Instance-Ha on OpenStack using InfraRed The Tasks in infrared_instance-ha_plugin_main.yml, along with the -plugin.spec at tripleo-quickstart-utils/plugin.spec provide support +plugin.spec at tripleo-ha-utils/plugin.spec provide support for running this repo's roles and playbooks as an Infrared plugin. [InfraRed](http://infrared.readthedocs.io/en/stable/) is a plugin based system - that aims to provide an easy-to-use CLI for Ansible based projects and + that aims to provide an easy-to-use CLI for Ansible based projects and OpenStack deployment. -The plugin provides infrared plugin integration for -two OpenStack High-Availability features: +The plugin provides infrared plugin integration for +two OpenStack High-Availability features: - [instance-ha](https://github.com/redhat-openstack/tripleo-quickstart-utils/tree/master/roles/instance-ha) + [instance-ha](https://github.com/openstack/tripleo-ha-utils/tree/master/roles/instance-ha) - [stonith-config](https://github.com/redhat-openstack/tripleo-quickstart-utils/tree/master/roles/stonith-config) + [stonith-config](https://github.com/openstack/tripleo-ha-utils/tree/master/roles/stonith-config) -Usage: +Usage: ===== **Installation and deployment:** [Setup InfraRed](http://infrared.readthedocs.io/en/stable/bootstrap.html) -ir plugin add https://github.com/redhat-openstack/tripleo-quickstart-utils +ir plugin add https://github.com/openstack/tripleo-ha-utils -export ANSIBLE_ROLES_PATH='plugins/tripleo-quickstart-utils/roles' +export ANSIBLE_ROLES_PATH='plugins/tripleo-ha-utils/roles' ir instance-ha-deploy -v --release 12 --stonith_devices all @@ -49,4 +49,4 @@ ir plugin remove instance-ha-deploy Author Information ------------------ -Pini Komarov pkomarov@redhat.com \ No newline at end of file +Pini Komarov pkomarov@redhat.com diff --git a/infrared/infrared_instance-ha_plugin_main.yml b/infrared/infrared_instance-ha_plugin_main.yml index 63a25a4..19a3851 100644 --- a/infrared/infrared_instance-ha_plugin_main.yml +++ b/infrared/infrared_instance-ha_plugin_main.yml @@ -10,8 +10,8 @@ - name: check $ANSIBLE_ROLES_PATH is set fail: - msg: Please export ANSIBLE_ROLES_PATH='plugins/tripleo-quickstart-utils/roles' ; Before running this playbook with infrared. - when: '"tripleo-quickstart-utils" not in ansible_roles_path_out.stdout' + msg: Please export ANSIBLE_ROLES_PATH='plugins/tripleo-ha-utils/roles' ; Before running this playbook with infrared. + when: '"tripleo-ha-utils" not in ansible_roles_path_out.stdout' #manual override because of https://github.com/ansible/ansible/issues/26336 @@ -99,7 +99,7 @@ echo -e "Host undercloud\n Hostname 127.0.0.1\n IdentityFile /home/stack/.ssh/id_rsa\n User stack\n StrictHostKeyChecking no\n UserKnownHostsFile=/dev/null\n" > ssh.config.ansible openstack server list -c Name -c Networks | awk '/ctlplane/ {print $2, $4}' | sed s/ctlplane=//g | while read node; do node_name=$(echo $node | cut -f 1 -d " "); node_ip=$(echo $node | cut -f 2 -d " "); echo -e "Host $node_name\n Hostname $node_ip\n IdentityFile /home/stack/.ssh/id_rsa\n User heat-admin\n StrictHostKeyChecking no\n UserKnownHostsFile=/dev/null\n"; done >> ssh.config.ansible - - name: get tripleo-quickstart-utils repo + - name: get tripleo-ha-utils repo git: repo: 'https://github.com/openstack/tripleo-ha-utils.git' dest: /home/stack/tripleo-ha-utils diff --git a/rally/README.md b/rally/README.md index 2a0e4ec..9b2b80f 100644 --- a/rally/README.md +++ b/rally/README.md @@ -9,7 +9,7 @@ overcloud environment in which it was configured. Requirements ------------ -A working and accessible TripleO environment, as described [here](https://github.com/redhat-openstack/tripleo-quickstart-utils/tree/master/README.md). +A working and accessible TripleO environment, as described [here](https://github.com/openstack/tripleo-ha-utils/tree/master/README.md). so an *hosts* file containing the whole environment inventory and, if needed, a *ssh.config.ansible* with all the information to access nodes. @@ -25,7 +25,7 @@ into the overcloud you can rely on a command like this one: -e public_net_pool_start="192.168.99.211" \ -e public_net_pool_end="192.168.99.216" \ -e public_net_gateway="192.168.99.254" \ - tripleo-quickstart-utils/rally/instance-ha.yml + tripleo-ha-utils/rally/instance-ha.yml this command can be launched from the *undercloud* machine or from a jump host (which must have all the required file locally). diff --git a/setup.cfg b/setup.cfg index 8ff90b8..19a43c1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] -name = tripleo-quickstart-utils -summary = Extend tripleo-quickstart's abilities to deploy and test TripleO +name = tripleo-ha-utils +summary = Give a set of tools to test TripleO HA capabilities description-file = README.md author = Raoul Scarazzini author-email = rasca@redhat.com -home-page = http://docs.openstack.org/developer/tripleo-quickstart/ +home-page = https://github.com/openstack/tripleo-ha-utils/ classifier = License :: OSI Approved :: Apache Software License Development Status :: 4 - Beta