Build overcloud control and compute images for puppet

Change-Id: I16fade420302c498ee6ecbeac21edd9e8fbc97b0

elements/rhos-release/pre-install.d/01-rhos-release

@@ -15,3 +15,5 @@ if [ -z "$RHOS_PUDDLE" ]; then
 else
     rhos-release -d -p $RHOS_PUDDLE $RHOS_RELEASE
 fi
+
+yum-config-manager --enable rhelosp-rhel-7-server-opt

elements/undercloud-package-install/environment.d/00-package-install

@@ -47,3 +47,4 @@ export DIB_INSTALLTYPE_tripleo_heat_templates=${DIB_INSTALLTYPE_tripleo_heat_tem
 export DIB_INSTALLTYPE_get_pip_py=${DIB_INSTALLTYPE_get_pip_py:-package}
 export DIB_INSTALLTYPE_novnc=${DIB_INSTALLTYPE_novnc:-package}
 export DIB_INSTALLTYPE_ironic_discoverd=${DIB_INSTALLTYPE_ironic_discoverd:-package}
+export DIB_INSTALLTYPE_heat_config=${DIB_INSTALLTYPE_heat_config:-package}

scripts/instack-build-images

@@ -16,7 +16,8 @@ export ELEMENTS_PATH=${ELEMENTS_PATH:-"\
 $(pwd)/tripleo-puppet-elements/elements:\
 $INSTACKUNDERCLOUDELEMENTS:\
 /usr/share/tripleo-image-elements:\
-/usr/share/diskimage-builder/elements"}
+/usr/share/diskimage-builder/elements:\
+/usr/share/openstack-heat-templates/software-config/elements"}
 
 # Override TMP_DIR for image build.
 # It defaults /tmp. But, /tmp is usually tmpfs mounted on Fedora, and dib will
@@ -83,55 +84,29 @@ if [ "$PACKAGES" = "1" ]; then
     export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS undercloud-package-install pip-and-virtualenv-override"
 fi
 
-export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
-baremetal \
-base \
-boot-stack \
-ceilometer-agent-central \
-ceilometer-agent-notification \
-ceilometer-api \
-ceilometer-collector \
-cinder-api \
-cinder-lio \
-cinder-volume-nfs \
-common-venv \
-dhcp-all-interfaces \
-haproxy \
-horizon \
-hosts \
-keepalived \
-mariadb-rpm \
-neutron-network-node \
-ntp \
-os-collect-config \
-pip-cache \
-rabbitmq-server \
-snmpd \
-stable-interface-names \
-swift-proxy \
-swift-storage \
-use-ephemeral \
+# Puppet overcloud-specific configuration
+export DELOREAN_REPO_URL="http://104.130.230.24/centos70/05/d8/05d8a6b82bf1f16c064bbee84d95c88b73030fae_3ea5fe35"
+export PUPPET_COMMON_ELEMENTS="\
 sysctl \
+hosts \
+baremetal \
+dhcp-all-interfaces \
+os-collect-config \
+heat-config-puppet \
+puppet-modules \
+hiera \
+os-net-config \
+delorean-repo \
+"
+
+export OVERCLOUD_CONTROL_DIB_EXTRA_ARGS=${OVERCLOUD_CONTROL_DIB_EXTRA_ARGS:-"\
+$PUPPET_COMMON_ELEMENTS
+overcloud-controller \
 "}
 
 export OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS=${OVERCLOUD_COMPUTE_DIB_EXTRA_ARGS:-"\
-baremetal \
-base \
-common-venv \
-dhcp-all-interfaces \
-hosts \
-neutron-openvswitch-agent \
-nova-compute \
-nova-kvm \
-nfs-client \
-ntp \
-os-collect-config \
-pip-cache \
-pypi-openstack \
-snmpd \
-stable-interface-names \
-use-ephemeral \
-sysctl \
+$PUPPET_COMMON_ELEMENTS
+overcloud-compute
 "}
 
 

scripts/instack-setup-host-rhel7

@@ -51,6 +51,9 @@ if ! rpm -q python-zope-interface; then
     sudo yum install -y http://mirrors.kernel.org/fedora//releases/20/Everything/x86_64/os/Packages/p/python-zope-interface-4.0.5-2.fc20.x86_64.rpm
 fi
 
+# Required for building puppet-based images
+sudo yum install -y openstack-heat-templates
+
 # tripleo-puppet-elements is not yet in Delorean, so just git clone for now
 if [ ! -d "tripleo-puppet-elements" ]; then
     git clone http://git.openstack.org/openstack/tripleo-puppet-elements