converted cinder to use repo_packages

rpc_deployment/inventory/group_vars/cinder_all.yml

@@ -68,24 +68,6 @@ service_names:
   - cinder-scheduler
   - cinder-volume
 
-## Git Source
-## ALL of this has been relocated to vars/repo_packages
-## TODO(someone) this should be removed once the repo bits are all figured out.
-git_repo: https://git.openstack.org/openstack/cinder
-git_fallback_repo: https://github.com/openstack/cinder
-git_etc_example: etc/cinder/
-git_install_branch: 36406c9bb0bac99b5daf1b8194df73685cbe49ea
-
-service_pip_dependencies:
-  - pywbem
-  - ecdsa
-  - MySQL-python
-  - python-memcached
-  - pycrypto
-  - python-cinderclient
-  - python-keystoneclient
-  - keystonemiddleware
-
 container_directories:
   - /var/log/cinder
   - /var/lib/cinder
@@ -95,9 +77,3 @@ container_directories:
   - /var/cache/cinder
   - /var/lock/cinder
   - /var/run/cinder
-
-container_packages:
-  - libpq-dev
-  - libkmod-dev
-  - libkmod2
-  - dmeventd

rpc_deployment/playbooks/openstack/cinder-all.yml

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- include: cinder-common.yml
 - include: cinder-api.yml
 - include: cinder-scheduler.yml
 - include: cinder-volume.yml

rpc_deployment/playbooks/openstack/cinder-api.yml

@@ -13,18 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- hosts: cinder_all
-  user: root
-  roles:
-    - common
-    - common_sudoers
-    - container_common
-    - openstack_common
-    - openstack_openrc
-    - galera_client_cnf
-  vars_files:
-    - vars/openstack_service_vars/cinder_api.yml
-
 - hosts: cinder_api[0]
   user: root
   roles:

rpc_deployment/playbooks/openstack/cinder-common.yml

@@ -0,0 +1,27 @@
+---
+# 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: cinder_all
+  user: root
+  roles:
+    - common
+    - common_sudoers
+    - container_common
+    - openstack_common
+    - openstack_openrc
+    - galera_client_cnf
+  vars_files:
+    - vars/repo_packages/cinder.yml
+    - vars/openstack_service_vars/cinder_api.yml

rpc_deployment/playbooks/openstack/cinder-scheduler.yml

@@ -16,13 +16,7 @@
 - hosts: cinder_scheduler
   user: root
   roles:
-    - common
-    - common_sudoers
-    - container_common
-    - openstack_common
-    - openstack_openrc
     - cinder_common
-    - galera_client_cnf
     - init_script
   vars_files:
     - vars/openstack_service_vars/cinder_scheduler.yml

rpc_deployment/playbooks/openstack/cinder-volume.yml

@@ -16,17 +16,11 @@
 - hosts: cinder_volume
   user: root
   roles:
-    - common
-    - common_sudoers
     - container_extra_setup
-    - container_common
-    - openstack_common
-    - openstack_openrc
     - cinder_common
     - cinder_volume
     - cinder_device_add
     - cinder_backend_types
-    - galera_client_cnf
     - init_script
   vars_files:
     - vars/config_vars/container_config_cinder_volume.yml