diff options
Diffstat (limited to 'hot/software-config/boot-config')
6 files changed, 21 insertions, 18 deletions
diff --git a/hot/software-config/boot-config/README.rst b/hot/software-config/boot-config/README.rst index 0789de9..942dd94 100644 --- a/hot/software-config/boot-config/README.rst +++ b/hot/software-config/boot-config/README.rst @@ -7,7 +7,10 @@ Heat::InstallConfigAgent. This can be used by server user_data when booting a pristine image to install the agent required to use software deployment resources in -templates. +templates. The templates assume that you have the heat-agents +repository checked out alongside the heat-templates repository; if the +agent code is in a different location you will need to adjust the paths +in the templates. The environments only install the heat-config-script hook. If other hooks are required then define your own environment file which defines a resource diff --git a/hot/software-config/boot-config/templates/install_config_agent_centos7_rdo.yaml b/hot/software-config/boot-config/templates/install_config_agent_centos7_rdo.yaml index 0926bff..811ee3e 100644 --- a/hot/software-config/boot-config/templates/install_config_agent_centos7_rdo.yaml +++ b/hot/software-config/boot-config/templates/install_config_agent_centos7_rdo.yaml @@ -15,9 +15,9 @@ resources: config: str_replace: params: - $heat_config_script: {get_file: ../../elements/heat-config/os-refresh-config/configure.d/55-heat-config} - $hook_script: {get_file: ../../elements/heat-config-script/install.d/hook-script.py} - $heat_config_notify: {get_file: ../../elements/heat-config/bin/heat-config-notify} + $heat_config_script: {get_file: ../../../../../heat-agents/heat-config/os-refresh-config/configure.d/55-heat-config} + $hook_script: {get_file: ../../../../../heat-agents/heat-config-script/install.d/hook-script.py} + $heat_config_notify: {get_file: ../../../../../heat-agents/heat-config/bin/heat-config-notify} $occ_conf: {get_file: fragments/os-collect-config.conf} $orc_oac: {get_file: fragments/20-os-apply-config} template: {get_file: fragments/configure_config_agent.sh} diff --git a/hot/software-config/boot-config/templates/install_config_agent_fedora_pip.yaml b/hot/software-config/boot-config/templates/install_config_agent_fedora_pip.yaml index 601a47c..5420a37 100644 --- a/hot/software-config/boot-config/templates/install_config_agent_fedora_pip.yaml +++ b/hot/software-config/boot-config/templates/install_config_agent_fedora_pip.yaml @@ -21,9 +21,9 @@ resources: config: str_replace: params: - $heat_config_script: {get_file: ../../elements/heat-config/os-refresh-config/configure.d/55-heat-config} - $hook_script: {get_file: ../../elements/heat-config-script/install.d/hook-script.py} - $heat_config_notify: {get_file: ../../elements/heat-config/bin/heat-config-notify} + $heat_config_script: {get_file: ../../../../../heat-agents/heat-config/os-refresh-config/configure.d/55-heat-config} + $hook_script: {get_file: ../../../../../heat-agents/heat-config-script/install.d/hook-script.py} + $heat_config_notify: {get_file: ../../../../../heat-agents/heat-config/bin/heat-config-notify} $occ_conf: {get_file: fragments/os-collect-config.conf} $orc_oac: {get_file: fragments/20-os-apply-config} template: {get_file: fragments/configure_config_agent.sh} diff --git a/hot/software-config/boot-config/templates/install_config_agent_fedora_yum.yaml b/hot/software-config/boot-config/templates/install_config_agent_fedora_yum.yaml index 4db7688..65acd81 100644 --- a/hot/software-config/boot-config/templates/install_config_agent_fedora_yum.yaml +++ b/hot/software-config/boot-config/templates/install_config_agent_fedora_yum.yaml @@ -15,9 +15,9 @@ resources: config: str_replace: params: - $heat_config_script: {get_file: ../../elements/heat-config/os-refresh-config/configure.d/55-heat-config} - $hook_script: {get_file: ../../elements/heat-config-script/install.d/hook-script.py} - $heat_config_notify: {get_file: ../../elements/heat-config/bin/heat-config-notify} + $heat_config_script: {get_file: ../../../../../heat-agents/heat-config/os-refresh-config/configure.d/55-heat-config} + $hook_script: {get_file: ../../../../../heat-agents/heat-config-script/install.d/hook-script.py} + $heat_config_notify: {get_file: ../../../../../heat-agents/heat-config/bin/heat-config-notify} $occ_conf: {get_file: fragments/os-collect-config.conf} $orc_oac: {get_file: fragments/20-os-apply-config} template: {get_file: fragments/configure_config_agent.sh} diff --git a/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml b/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml index 752e76b..7fd7466 100644 --- a/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml +++ b/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml @@ -32,9 +32,9 @@ resources: config: str_replace: params: - $heat_config_script: {get_file: ../../elements/heat-config/os-refresh-config/configure.d/55-heat-config} - $hook_script: {get_file: ../../elements/heat-config-script/install.d/hook-script.py} - $heat_config_notify: {get_file: ../../elements/heat-config/bin/heat-config-notify} + $heat_config_script: {get_file: ../../../../../heat-agents/heat-config/os-refresh-config/configure.d/55-heat-config} + $hook_script: {get_file: ../../../../../heat-agents/heat-config-script/install.d/hook-script.py} + $heat_config_notify: {get_file: ../../../../../heat-agents/heat-config/bin/heat-config-notify} $occ_conf: {get_file: fragments/os-collect-config.conf} $orc_oac: {get_file: fragments/20-os-apply-config} template: {get_file: fragments/configure_config_agent.sh} @@ -48,7 +48,7 @@ resources: - path: /var/lib/heat-config/hooks/puppet owner: "root:root" permissions: "0755" - content: {get_file: ../../elements/heat-config-puppet/install.d/hook-puppet.py} + content: {get_file: ../../../../../heat-agents/heat-config-puppet/install.d/hook-puppet.py} install_cfn_init_hook: type: "OS::Heat::CloudConfig" @@ -59,7 +59,7 @@ resources: - path: /var/lib/heat-config/hooks/cfn-init owner: "root:root" permissions: "0755" - content: {get_file: ../../elements/heat-config-cfn-init/install.d/hook-cfn-init.py} + content: {get_file: ../../../../../heat-agents/heat-config-cfn-init/install.d/hook-cfn-init.py} start_config_agent: type: "OS::Heat::SoftwareConfig" diff --git a/hot/software-config/boot-config/templates/install_config_agent_ubuntu_pip.yaml b/hot/software-config/boot-config/templates/install_config_agent_ubuntu_pip.yaml index 2567e93..bfc8f2b 100644 --- a/hot/software-config/boot-config/templates/install_config_agent_ubuntu_pip.yaml +++ b/hot/software-config/boot-config/templates/install_config_agent_ubuntu_pip.yaml @@ -21,9 +21,9 @@ resources: config: str_replace: params: - $heat_config_script: {get_file: ../../elements/heat-config/os-refresh-config/configure.d/55-heat-config} - $hook_script: {get_file: ../../elements/heat-config-script/install.d/hook-script.py} - $heat_config_notify: {get_file: ../../elements/heat-config/bin/heat-config-notify} + $heat_config_script: {get_file: ../../../../../heat-agents/heat-config/os-refresh-config/configure.d/55-heat-config} + $hook_script: {get_file: ../../../../../heat-agents/heat-config-script/install.d/hook-script.py} + $heat_config_notify: {get_file: ../../../../../heat-agents/heat-config/bin/heat-config-notify} $occ_conf: {get_file: fragments/os-collect-config.conf} $orc_oac: {get_file: fragments/20-os-apply-config} template: {get_file: fragments/configure_config_agent.sh} |