Merge "Remove heat code from devstack tree"

openstack · Dec 6, 2016 · 77a7296 · 77a7296
2 parents 2f1da40 + 8f985b6
commit 77a7296
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 607 deletions.
diff --git a/clean.sh b/clean.sh
@@ -49,7 +49,6 @@ source $TOP_DIR/lib/nova
 source $TOP_DIR/lib/placement
 source $TOP_DIR/lib/cinder
 source $TOP_DIR/lib/swift
-source $TOP_DIR/lib/heat
 source $TOP_DIR/lib/neutron
 source $TOP_DIR/lib/neutron-legacy
 
@@ -108,7 +107,7 @@ if is_service_enabled nova && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; th
 fi
 
 # Clean out /etc
-sudo rm -rf /etc/keystone /etc/glance /etc/nova /etc/cinder /etc/swift /etc/heat /etc/neutron /etc/openstack/
+sudo rm -rf /etc/keystone /etc/glance /etc/nova /etc/cinder /etc/swift /etc/neutron /etc/openstack/
 
 # Clean out tgt
 sudo rm -f /etc/tgt/conf.d/*

diff --git a/files/apache-heat-api-cfn.template b/files/apache-heat-api-cfn.template
diff --git a/files/apache-heat-api-cloudwatch.template b/files/apache-heat-api-cloudwatch.template
diff --git a/files/apache-heat-api.template b/files/apache-heat-api.template
diff --git a/files/apache-heat-pip-repo.template b/files/apache-heat-pip-repo.template
diff --git a/files/debs/heat b/files/debs/heat