From 18c49e43fe2da1cce1346fb9fd385cb97ae79f95 Mon Sep 17 00:00:00 2001 From: Alexey Khivin Date: Wed, 20 Jul 2016 19:15:29 +0300 Subject: [PATCH] Cycle dependency of Puppet and CICDUtils was avoided Hosts class moved from CICDUtils to Puppet for avoiding cyclic dependency Change-Id: I17821b8faf211fe2a04a2340772f3ef852daf335 --- .../CiCdEnvironment/package/Classes/CiCdEnvironment.yaml | 2 +- murano-apps/CiCdUtils/package/manifest.yaml | 3 --- murano-apps/Puppet/package/Classes/PuppetServer.yaml | 2 +- .../{CiCdUtils => Puppet}/package/Classes/net/Hosts.yaml | 2 +- murano-apps/Puppet/package/manifest.yaml | 3 +-- 5 files changed, 4 insertions(+), 8 deletions(-) rename murano-apps/{CiCdUtils => Puppet}/package/Classes/net/Hosts.yaml (97%) diff --git a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml index e43efc1..856e124 100644 --- a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml +++ b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml @@ -3,7 +3,7 @@ Namespaces: std: io.murano ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app puppet: org.openstack.ci_cd_pipeline_murano_app.puppet - net: org.openstack.ci_cd_pipeline_murano_app.utils.net + net: org.openstack.ci_cd_pipeline_murano_app.puppet.net Name: CiCdEnvironment diff --git a/murano-apps/CiCdUtils/package/manifest.yaml b/murano-apps/CiCdUtils/package/manifest.yaml index 31beb35..0924dec 100644 --- a/murano-apps/CiCdUtils/package/manifest.yaml +++ b/murano-apps/CiCdUtils/package/manifest.yaml @@ -9,7 +9,4 @@ Description: | Author: 'Mirantis, Inc' Tags: [CI, Utils] Classes: - org.openstack.ci_cd_pipeline_murano_app.utils.net.Hosts: net/Hosts.yaml org.openstack.ci_cd_pipeline_murano_app.utils.CombinableApplication: CombinableApplication.yaml -Require: - org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet: diff --git a/murano-apps/Puppet/package/Classes/PuppetServer.yaml b/murano-apps/Puppet/package/Classes/PuppetServer.yaml index 73ff2a7..bce7525 100644 --- a/murano-apps/Puppet/package/Classes/PuppetServer.yaml +++ b/murano-apps/Puppet/package/Classes/PuppetServer.yaml @@ -14,7 +14,7 @@ Namespaces: =: org.openstack.ci_cd_pipeline_murano_app.puppet conf: io.murano.configuration sys: io.murano.system - net: org.openstack.ci_cd_pipeline_murano_app.utils.net + net: org.openstack.ci_cd_pipeline_murano_app.puppet.net puppet: org.openstack.ci_cd_pipeline_murano_app.puppet Name: PuppetServer diff --git a/murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml b/murano-apps/Puppet/package/Classes/net/Hosts.yaml similarity index 97% rename from murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml rename to murano-apps/Puppet/package/Classes/net/Hosts.yaml index 4f2d6e5..24a3c52 100644 --- a/murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml +++ b/murano-apps/Puppet/package/Classes/net/Hosts.yaml @@ -1,5 +1,5 @@ Namespaces: - =: org.openstack.ci_cd_pipeline_murano_app.utils.net + =: org.openstack.ci_cd_pipeline_murano_app.puppet.net std: io.murano res: io.murano.resources sys: io.murano.system diff --git a/murano-apps/Puppet/package/manifest.yaml b/murano-apps/Puppet/package/manifest.yaml index ee1ffbe..b1c08b2 100644 --- a/murano-apps/Puppet/package/manifest.yaml +++ b/murano-apps/Puppet/package/manifest.yaml @@ -10,11 +10,10 @@ Description: | Author: 'Mirantis, Inc' Tags: [Server, Puppet] Classes: + org.openstack.ci_cd_pipeline_murano_app.puppet.net.Hosts: net/Hosts.yaml org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance: PuppetInstance.yaml org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetServer: PuppetServer.yaml org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetClient: PuppetClient.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 -Require: - org.openstack.ci_cd_pipeline_murano_app.utils.CiCdUtils: