From 2f7998c15741d739dd62ccb9ca5bb3a307806311 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 30 Sep 2014 23:45:27 -0500 Subject: [PATCH] converted keystone to use repo packges --- .../inventory/group_vars/keystone_all.yml | 30 ------------------- .../openstack/keystone-add-all-services.yml | 1 + .../playbooks/openstack/keystone-all.yml | 18 +++++++++++ .../playbooks/openstack/keystone-common.yml | 29 ++++++++++++++++++ .../playbooks/openstack/keystone.yml | 17 ++--------- .../playbooks/openstack/openstack-common.yml | 2 +- .../playbooks/openstack/openstack-setup.yml | 3 +- 7 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 rpc_deployment/playbooks/openstack/keystone-all.yml create mode 100644 rpc_deployment/playbooks/openstack/keystone-common.yml diff --git a/rpc_deployment/inventory/group_vars/keystone_all.yml b/rpc_deployment/inventory/group_vars/keystone_all.yml index f9ef13dca5..834725d6ca 100644 --- a/rpc_deployment/inventory/group_vars/keystone_all.yml +++ b/rpc_deployment/inventory/group_vars/keystone_all.yml @@ -53,23 +53,6 @@ system_user: keystone system_group: keystone -## Git Source -git_repo: https://git.openstack.org/openstack/keystone -git_fallback_repo: https://github.com/openstack/keystone -git_etc_example: etc/ -git_install_branch: 7c2bee76936461043671adc6d100f20775c4212f - -# Common PIP Packages -service_pip_dependencies: - - repoze.lru - - pbr - - MySQL-python - - pycrypto - - python-memcached - - pycrypto - - python-keystoneclient - - ## Enable SSL keystone_ssl: false @@ -85,16 +68,3 @@ container_directories: - /var/lib/keystone - /var/log/keystone - /var/www/cgi-bin/keystone - -container_packages: - - libsasl2-dev - - debhelper - - dh-apparmor - - docutils-common - - libjs-sphinxdoc - - libjs-underscore - - libxslt1.1 - - libldap2-dev - - apache2 - - apache2-utils - - libapache2-mod-wsgi diff --git a/rpc_deployment/playbooks/openstack/keystone-add-all-services.yml b/rpc_deployment/playbooks/openstack/keystone-add-all-services.yml index c54c296045..bb146ec33a 100644 --- a/rpc_deployment/playbooks/openstack/keystone-add-all-services.yml +++ b/rpc_deployment/playbooks/openstack/keystone-add-all-services.yml @@ -78,6 +78,7 @@ - inventory/group_vars/neutron_all.yml - vars/openstack_service_vars/neutron_server_endpoint.yml + ## Nova - hosts: keystone[0] user: root diff --git a/rpc_deployment/playbooks/openstack/keystone-all.yml b/rpc_deployment/playbooks/openstack/keystone-all.yml new file mode 100644 index 0000000000..c16fce0ae4 --- /dev/null +++ b/rpc_deployment/playbooks/openstack/keystone-all.yml @@ -0,0 +1,18 @@ +--- +# 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. + +- include: keystone-common.yml +- include: keystone.yml +- include: keystone-add-all-services.yml diff --git a/rpc_deployment/playbooks/openstack/keystone-common.yml b/rpc_deployment/playbooks/openstack/keystone-common.yml new file mode 100644 index 0000000000..16ec8a930b --- /dev/null +++ b/rpc_deployment/playbooks/openstack/keystone-common.yml @@ -0,0 +1,29 @@ +--- +# 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. + +- hosts: keystone + user: root + roles: + - common + - common_sudoers + - container_common + - keystone_common + - openstack_common + - openstack_openrc + - galera_client_cnf + vars_files: + - vars/repo_packages/keystone.yml + - vars/config_vars/keystone_config.yml + - vars/openstack_service_vars/keystone.yml diff --git a/rpc_deployment/playbooks/openstack/keystone.yml b/rpc_deployment/playbooks/openstack/keystone.yml index 320200a840..3402cfde39 100644 --- a/rpc_deployment/playbooks/openstack/keystone.yml +++ b/rpc_deployment/playbooks/openstack/keystone.yml @@ -13,21 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This playbook deploys Keystone-API. -- hosts: keystone - user: root - roles: - - common - - common_sudoers - - container_common - - keystone_common - - openstack_common - - openstack_openrc - - galera_client_cnf - vars_files: - - vars/config_vars/keystone_config.yml - - vars/openstack_service_vars/keystone.yml - # Setup Keystone - hosts: keystone[0] user: root @@ -39,6 +24,7 @@ vars: auth_admin_uri: "{{ auth_protocol }}://{{ container_address }}:{{ auth_port }}/v2.0" vars_files: + - vars/repo_packages/keystone.yml - vars/openstack_service_vars/keystone.yml - vars/openstack_service_vars/keystone_endpoint.yml @@ -48,4 +34,5 @@ roles: - keystone_apache vars_files: + - vars/repo_packages/keystone.yml - vars/openstack_service_vars/keystone.yml diff --git a/rpc_deployment/playbooks/openstack/openstack-common.yml b/rpc_deployment/playbooks/openstack/openstack-common.yml index 42574f6559..a9430bb934 100644 --- a/rpc_deployment/playbooks/openstack/openstack-common.yml +++ b/rpc_deployment/playbooks/openstack/openstack-common.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -- hosts: keystone_all:glance_all:heat_all:nova_all:cinder_all +- hosts: glance_all:heat_all:nova_all:cinder_all user: root roles: - common diff --git a/rpc_deployment/playbooks/openstack/openstack-setup.yml b/rpc_deployment/playbooks/openstack/openstack-setup.yml index 3ea6f3da82..2883e55e37 100644 --- a/rpc_deployment/playbooks/openstack/openstack-setup.yml +++ b/rpc_deployment/playbooks/openstack/openstack-setup.yml @@ -14,8 +14,7 @@ # limitations under the License. - include: openstack-common.yml -- include: keystone.yml -- include: keystone-add-all-services.yml +- include: keystone-all.yml - include: glance-all.yml - include: heat-all.yml - include: nova-all.yml