From 48d9d205cab7c7925b0e8b0cf596198870f9fd14 Mon Sep 17 00:00:00 2001 From: Alexey Khivin Date: Sat, 25 Jun 2016 17:13:12 +0300 Subject: [PATCH] [Puppet] Scripts moved to a separate folders * install - scripts to install puppet itself * core - scripts related to puppet related functions binded to MuranoPL * server (future) - scripts related to puppet server installation and configuration Change-Id: I4b2be96721958b0847967f72d7cf83ecc9c1f5b8 --- .../Puppet/package/Resources/ApplyManifest.template | 4 ++-- .../Puppet/package/Resources/GetHieraData.template | 2 +- .../Puppet/package/Resources/InstallHiera.template | 6 ++++-- .../Puppet/package/Resources/InstallPuppet.template | 2 +- .../Puppet/package/Resources/InstallPuppetModule.template | 2 +- .../Puppet/package/Resources/PuppetExecuteInline.template | 2 +- .../Resources/scripts/{ => core}/apply_manifest.sh | 0 .../Resources/scripts/{ => core}/exec_puppet_inline.sh | 0 .../Resources/scripts/{ => core}/get_hiera_data.sh | 0 .../Resources/scripts/{ => core}/install_puppet_module.sh | 0 .../package/Resources/scripts/{ => install}/hiera.yaml | 0 .../Resources/scripts/{ => install}/install_hiera.sh | 2 -- .../Resources/scripts/{ => install}/install_puppet.sh | 0 .../package/Resources/scripts/{ => install}/murano.yaml | 0 murano-apps/Puppet/package/manifest.yaml | 8 ++++---- 15 files changed, 14 insertions(+), 14 deletions(-) rename murano-apps/Puppet/package/Resources/scripts/{ => core}/apply_manifest.sh (100%) rename murano-apps/Puppet/package/Resources/scripts/{ => core}/exec_puppet_inline.sh (100%) rename murano-apps/Puppet/package/Resources/scripts/{ => core}/get_hiera_data.sh (100%) rename murano-apps/Puppet/package/Resources/scripts/{ => core}/install_puppet_module.sh (100%) rename murano-apps/Puppet/package/Resources/scripts/{ => install}/hiera.yaml (100%) rename murano-apps/Puppet/package/Resources/scripts/{ => install}/install_hiera.sh (85%) rename murano-apps/Puppet/package/Resources/scripts/{ => install}/install_puppet.sh (100%) rename murano-apps/Puppet/package/Resources/scripts/{ => install}/murano.yaml (100%) diff --git a/murano-apps/Puppet/package/Resources/ApplyManifest.template b/murano-apps/Puppet/package/Resources/ApplyManifest.template index 932f3f1..ce58d85 100644 --- a/murano-apps/Puppet/package/Resources/ApplyManifest.template +++ b/murano-apps/Puppet/package/Resources/ApplyManifest.template @@ -19,7 +19,7 @@ Body: | applyManifest() Files: - manifest: + destinationFile: BodyType: Base64 Name: site.pp Body: $manifestContent @@ -28,7 +28,7 @@ Scripts: applyManifest: Type: Application Version: 1.0.0 - EntryPoint: apply_manifest.sh + EntryPoint: core/apply_manifest.sh Files: - site.pp Options: diff --git a/murano-apps/Puppet/package/Resources/GetHieraData.template b/murano-apps/Puppet/package/Resources/GetHieraData.template index 4e5551d..fb2ea12 100644 --- a/murano-apps/Puppet/package/Resources/GetHieraData.template +++ b/murano-apps/Puppet/package/Resources/GetHieraData.template @@ -12,7 +12,7 @@ Scripts: get_value: Type: Application Version: 1.0.0 - EntryPoint: get_hiera_data.sh + EntryPoint: core/get_hiera_data.sh Files: [] Options: captureStdout: true diff --git a/murano-apps/Puppet/package/Resources/InstallHiera.template b/murano-apps/Puppet/package/Resources/InstallHiera.template index 460533e..5aa515a 100644 --- a/murano-apps/Puppet/package/Resources/InstallHiera.template +++ b/murano-apps/Puppet/package/Resources/InstallHiera.template @@ -11,8 +11,10 @@ Scripts: installHiera: Type: Application Version: 1.0.0 - EntryPoint: install_hiera.sh - Files: ['hiera.yaml', 'murano.yaml'] + EntryPoint: install/install_hiera.sh + Files: + - install/hiera.yaml + - install/murano.yaml Options: captureStdout: true captureStderr: true diff --git a/murano-apps/Puppet/package/Resources/InstallPuppet.template b/murano-apps/Puppet/package/Resources/InstallPuppet.template index 4a8f9b7..82c0110 100644 --- a/murano-apps/Puppet/package/Resources/InstallPuppet.template +++ b/murano-apps/Puppet/package/Resources/InstallPuppet.template @@ -11,7 +11,7 @@ Scripts: installPuppet: Type: Application Version: 1.0.0 - EntryPoint: install_puppet.sh + EntryPoint: install/install_puppet.sh Files: [] Options: captureStdout: true diff --git a/murano-apps/Puppet/package/Resources/InstallPuppetModule.template b/murano-apps/Puppet/package/Resources/InstallPuppetModule.template index 1e26538..cd737e2 100644 --- a/murano-apps/Puppet/package/Resources/InstallPuppetModule.template +++ b/murano-apps/Puppet/package/Resources/InstallPuppetModule.template @@ -12,7 +12,7 @@ Scripts: installPuppetModule: Type: Application Version: 1.0.0 - EntryPoint: install_puppet_module.sh + EntryPoint: core/install_puppet_module.sh Files: [] Options: captureStdout: true diff --git a/murano-apps/Puppet/package/Resources/PuppetExecuteInline.template b/murano-apps/Puppet/package/Resources/PuppetExecuteInline.template index 0893639..dbc7940 100644 --- a/murano-apps/Puppet/package/Resources/PuppetExecuteInline.template +++ b/murano-apps/Puppet/package/Resources/PuppetExecuteInline.template @@ -26,7 +26,7 @@ Scripts: runPuppet: Type: Application Version: 1.0.0 - EntryPoint: exec_puppet_inline.sh + EntryPoint: core/exec_puppet_inline.sh Files: [] Options: captureStdout: true diff --git a/murano-apps/Puppet/package/Resources/scripts/apply_manifest.sh b/murano-apps/Puppet/package/Resources/scripts/core/apply_manifest.sh similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/apply_manifest.sh rename to murano-apps/Puppet/package/Resources/scripts/core/apply_manifest.sh diff --git a/murano-apps/Puppet/package/Resources/scripts/exec_puppet_inline.sh b/murano-apps/Puppet/package/Resources/scripts/core/exec_puppet_inline.sh similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/exec_puppet_inline.sh rename to murano-apps/Puppet/package/Resources/scripts/core/exec_puppet_inline.sh diff --git a/murano-apps/Puppet/package/Resources/scripts/get_hiera_data.sh b/murano-apps/Puppet/package/Resources/scripts/core/get_hiera_data.sh similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/get_hiera_data.sh rename to murano-apps/Puppet/package/Resources/scripts/core/get_hiera_data.sh diff --git a/murano-apps/Puppet/package/Resources/scripts/install_puppet_module.sh b/murano-apps/Puppet/package/Resources/scripts/core/install_puppet_module.sh similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/install_puppet_module.sh rename to murano-apps/Puppet/package/Resources/scripts/core/install_puppet_module.sh diff --git a/murano-apps/Puppet/package/Resources/scripts/hiera.yaml b/murano-apps/Puppet/package/Resources/scripts/install/hiera.yaml similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/hiera.yaml rename to murano-apps/Puppet/package/Resources/scripts/install/hiera.yaml diff --git a/murano-apps/Puppet/package/Resources/scripts/install_hiera.sh b/murano-apps/Puppet/package/Resources/scripts/install/install_hiera.sh similarity index 85% rename from murano-apps/Puppet/package/Resources/scripts/install_hiera.sh rename to murano-apps/Puppet/package/Resources/scripts/install/install_hiera.sh index 4acb630..59990c4 100644 --- a/murano-apps/Puppet/package/Resources/scripts/install_hiera.sh +++ b/murano-apps/Puppet/package/Resources/scripts/install/install_hiera.sh @@ -15,8 +15,6 @@ cp murano.yaml /etc/puppet/hieradata/murano.yaml mkdir /etc/system-config/ -#cp murano.yaml /opt/system-config/murano.yaml - puppet config set environment production exit \ No newline at end of file diff --git a/murano-apps/Puppet/package/Resources/scripts/install_puppet.sh b/murano-apps/Puppet/package/Resources/scripts/install/install_puppet.sh similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/install_puppet.sh rename to murano-apps/Puppet/package/Resources/scripts/install/install_puppet.sh diff --git a/murano-apps/Puppet/package/Resources/scripts/murano.yaml b/murano-apps/Puppet/package/Resources/scripts/install/murano.yaml similarity index 100% rename from murano-apps/Puppet/package/Resources/scripts/murano.yaml rename to murano-apps/Puppet/package/Resources/scripts/install/murano.yaml diff --git a/murano-apps/Puppet/package/manifest.yaml b/murano-apps/Puppet/package/manifest.yaml index 48db9b8..5dfcc75 100644 --- a/murano-apps/Puppet/package/manifest.yaml +++ b/murano-apps/Puppet/package/manifest.yaml @@ -10,7 +10,7 @@ Description: | Author: 'Mirantis, Inc' Tags: [Server, Puppet] Classes: - org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance: PuppetInstance.yaml - org.openstack.ci_cd_pipeline_murano_app.puppet.Hiera: Hiera.yaml - org.openstack.ci_cd_pipeline_murano_app.puppet.YamlTool: YamlTool.yaml - org.openstack.ci_cd_pipeline_murano_app.puppet.YamlFile: YamlFile.yaml \ No newline at end of file + org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance: PuppetInstance.yaml + org.openstack.ci_cd_pipeline_murano_app.puppet.Hiera: Hiera.yaml + org.openstack.ci_cd_pipeline_murano_app.puppet.YamlTool: YamlTool.yaml + org.openstack.ci_cd_pipeline_murano_app.puppet.YamlFile: YamlFile.yaml \ No newline at end of file