Some minor changes to container boot-config

Some minor changes and cleanup.

Change-Id: Ic98a0138744d031308e437f14207e03be67a0019

hot/software-config/boot-config/container_agent_env.yaml

@@ -1,4 +1,4 @@
-# Installs docker software-config agents on boot in a container
+# Installs heat-container-agent on boot in a container
 
 resource_registry:
   "Heat::InstallConfigAgent": templates/install_container_agent.yaml

hot/software-config/boot-config/templates/install_container_agent.yaml

@@ -7,7 +7,7 @@ parameters:
 
 resources:
   write_image_pull_script:
-    type: "OS::Heat::SoftwareConfig"
+    type: OS::Heat::SoftwareConfig
     properties:
       group: ungrouped
       config: {get_file: ./fragments/get_container_agent_image.frag}
@@ -23,7 +23,7 @@ resources:
           template: {get_file: ./fragments/start_container_agent.sh}
 
   node_init:
-    type: "OS::Heat::MultipartMime"
+    type: OS::Heat::MultipartMime
     properties:
       parts:
         - config: {get_resource: write_image_pull_script}

hot/software-config/example-templates/example-pristine-atomic-docker-compose.yaml

@@ -4,7 +4,7 @@ description: >
   container with docker-compose agent.
   This template expects to be created with an environment which defines
   the resource type Heat::InstallConfigAgent such as
-  ../boot-config-docker/heat_docker_agents_env.yaml
+  ../boot-config/heat_container_agent_env.yaml
 parameters:
   key_name:
     type: string

hot/software-config/heat-container-agent/Dockerfile

@@ -8,7 +8,7 @@ ADD ./scripts/55-heat-config \
 ADD ./scripts/50-heat-config-docker-compose \
   /opt/stack/os-config-refresh/configure.d/
 
-ADD ./scripts/* \
+ADD ./scripts/hooks/* \
   /var/lib/heat-config/hooks/
 
 ADD ./scripts/heat-config-notify \

hot/software-config/heat-container-agent/scripts/configure_container_agent.sh

@@ -4,7 +4,8 @@ set -eux
 yum -y update
 
 yum -y install os-collect-config os-apply-config \
-  os-refresh-config dib-utils python-pip python-docker-py
+  os-refresh-config dib-utils python-pip \
+  python-docker-py python-yaml
 
 yum clean all
 
@@ -15,6 +16,7 @@ pip install dpath
 # os-collect-config requires 2.5.3 where as for docker-compose it's <2.5.0
 curl -L https://github.com/docker/compose/releases/download/1.1.0/docker-compose-`uname -s`-`uname -m` \
     > /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
 
 # os-apply-config templates directory
 oac_templates=/usr/libexec/os-apply-config/templates
@@ -97,10 +99,6 @@ exec os-apply-config
 EOF
 chmod 700 $orc_scripts/configure.d/20-os-apply-config
 
-# create hooks directory
-#hooks_dir=/var/lib/heat-config/hooks
-#mkdir -p $hooks_dir
-
 chmod 700 /opt/stack/os-config-refresh/configure.d/55-heat-config
 chmod 700 /opt/stack/os-config-refresh/configure.d/50-heat-config-docker-compose
 

hot/software-config/heat-container-agent/scripts/docker-compose

@@ -1 +0,0 @@
-../../elements/heat-config-docker-compose/install.d/hook-docker-compose.py

hot/software-config/heat-container-agent/scripts/hooks/atomic

@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ast
 import json
 import logging
 import os

hot/software-config/heat-container-agent/scripts/hooks/docker-compose

@@ -0,0 +1 @@
+../../../elements/heat-config-docker-compose/install.d/hook-docker-compose.py

hot/software-config/heat-container-agent/scripts/hooks/script

@@ -0,0 +1 @@
+../../../elements/heat-config-script/install.d/hook-script.py

hot/software-config/heat-container-agent/scripts/script

@@ -1 +0,0 @@
-../../elements/heat-config-script/install.d/hook-script.py