From 6083ec14d2d982856e72069b8674ceb5729329a0 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Wed, 11 Feb 2015 16:26:22 +0000 Subject: [PATCH] Remove and/or rename Rackspace related bits This patch removes and/or renames anything that is Rackspace specific from the playbooks, roles and variables. It also removes items which appear to be orphaned/unused and flattens the playbooks into a single directory in order to better match ansible best practise (and remove some horrible fiddles we were doing). The following have been removed due to RAX/RPC naming or RAX/RPC specific usage: - playbooks/monitoring - playbooks/rax* - playbooks/rpc* - roles/maas* - roles/rax* - roles/rpc* - scripts/f5-* - scripts/maas* - scripts/rpc* - scripts/*lab* - vars/repo_packages/rackspace* - vars/repo_packages/rax* - vars/repo_packages/rpc* - vars/repo_packages/holland.yml The following have been removed as they are unused: - playbooks/setup/host-network-setup.yml - roles/openssl_pem_request - roles/host_interfaces - scripts/elsa* - ssh/ - vars/repo_packages/turbolift.yml The following directories have been renamed: - etc/rpc_deploy > etc/openstack_deploy - rpc_deployment > playbooks The playbooks have all been moved into a single directory: - rpc_deployment/playbooks/infrastructure/* > playbooks/ - rpc_deployment/playbooks/openstack/* > playbooks/ - rpc_deployment/playbooks/setup/* > playbooks/ The following files have been renamed: - lxc-rpc > lxc-openstack - lxc-rpc.conf > lxc-openstack.conf - rpc_environment > openstack_environment - rpc_release > openstack_release (etc and pip) - rpc_tempest_gate.sh > openstack_tempest_gate.sh - rpc_user_config > openstack_user_config The following variables have been renamed: - rpc_release > openstack_release - rpc_repo_url > openstack_repo_url The following variables have been introduced: - openstack_code_name: The code name of the upstream OpenStack release (eg: Juno) Notable variable/template value changes: - rabbit_cluster_name: rpc > openstack - wsrep_cluster_name: rpc_galera_cluster > openstack_galera_cluster DocImpact Closes-Bug: #1403676 Implements: blueprint rackspace-namesake Change-Id: Ib480fdad500b03c7cb90684aa444da9946ba8032 --- tasks/main.yml | 22 ++++++++++++++++++++++ templates/openrc | 15 +++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 tasks/main.yml create mode 100644 templates/openrc diff --git a/tasks/main.yml b/tasks/main.yml new file mode 100644 index 0000000..d27c3b7 --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1,22 @@ +--- +# Copyright 2014, Rackspace US, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +- name: Create openrc file + template: > + src=openrc + dest=/root/openrc + owner=root + group=root + mode=0600 diff --git a/templates/openrc b/templates/openrc new file mode 100644 index 0000000..def0063 --- /dev/null +++ b/templates/openrc @@ -0,0 +1,15 @@ +# Do not edit, changes will be overwritten + +# COMMON CINDER ENVS +export CINDER_ENDPOINT_TYPE=internalURL + +# COMMON NOVA ENVS +export NOVA_ENDPOINT_TYPE=internalURL + +# COMMON OPENSTACK ENVS +export OS_ENDPOINT_TYPE=internalURL +export OS_USERNAME={{ auth_admin_username }} +export OS_PASSWORD={{ auth_admin_password }} +export OS_TENANT_NAME={{ auth_admin_tenant }} +export OS_AUTH_URL={{ auth_identity_uri }} +export OS_NO_CACHE=1