Merge pull request #203 from mattt416/trello_135

Convert heat to use repo_packages

rpc_deployment/inventory/group_vars/heat_all.yml

@@ -27,7 +27,6 @@ verbose: True
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
 
-
 ## DB
 container_mysql_user: heat
 container_mysql_password: "{{ heat_container_mysql_password }}"
@@ -64,24 +63,6 @@ heat_watch_server_url: "http://{{ external_vip_address }}:8003"
 heat_waitcondition_server_url: "http://{{ internal_vip_address }}:8000/v1/waitcondition"
 heat_metadata_server_url: "http://{{ internal_vip_address }}:8000"
 
-## 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/heat
-git_fallback_repo: https://github.com/openstack/heat
-git_etc_example: etc/heat
-git_install_branch: 93f3c78a8bd9ecb79fa3d719468b371e67519969
-
-service_pip_dependencies:
-  - MySQL-python
-  - python-memcached
-  - pycrypto
-  - python-heatclient
-  - python-keystoneclient
-  - python-troveclient
-  - python-ceilometerclient
-  - keystonemiddleware
-
 container_directories:
   - /etc/heat
   - /etc/heat/environment.d
@@ -89,7 +70,3 @@ container_directories:
   - /var/cache/heat
   - /var/lib/heat
   - /var/log/heat
-
-container_packages:
-  - rsync
-  - libxslt1.1 

rpc_deployment/playbooks/openstack/heat-all.yml

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

rpc_deployment/playbooks/openstack/heat-api-cfn.yml

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

rpc_deployment/playbooks/openstack/heat-api-cloudwatch.yml

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

rpc_deployment/playbooks/openstack/heat-api.yml

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

rpc_deployment/playbooks/openstack/heat-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: heat_all
+  user: root
+  roles:
+    - common
+    - common_sudoers
+    - container_common
+    - openstack_common
+    - openstack_openrc
+    - galera_client_cnf
+  vars_files:
+    - vars/openstack_service_vars/heat_api.yml
+    - vars/repo_packages/heat.yml

rpc_deployment/playbooks/openstack/heat-engine.yml

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

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: glance_all:heat_all:cinder_all
+- hosts: glance_all:cinder_all
   user: root
   roles:
     - common

rpc_deployment/vars/repo_packages/heat.yml

@@ -21,6 +21,7 @@ repo_path: "{{ repo_package_name }}_{{ git_install_branch | replace('/', '_') }}
 git_repo: https://git.openstack.org/openstack/heat
 git_fallback_repo: https://github.com/openstack/heat
 git_dest: "/opt/{{ repo_path }}"
+git_etc_example: etc/heat
 git_install_branch: master
 
 pip_wheel_name: heat