x/ci-cd-pipeline-app-murano
Code Issues Proposed changes

Merge "Cycle dependency of Puppet and CICDUtils was avoided"

Browse Source
This commit is contained in:
Jenkins 2016-08-02 12:32:35 +00:00 committed by Gerrit Code Review
commit 218b9d7f2c
5 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
View File

@ -3,7 +3,7 @@ Namespaces:
std: io.murano std: io.murano
ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app
puppet: org.openstack.ci_cd_pipeline_murano_app.puppet 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 Name: CiCdEnvironment

3
murano-apps/CiCdUtils/package/manifest.yaml
View File

@ -9,7 +9,4 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [CI, Utils] Tags: [CI, Utils]
Classes: 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 org.openstack.ci_cd_pipeline_murano_app.utils.CombinableApplication: CombinableApplication.yaml
Require:
org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:

2
murano-apps/Puppet/package/Classes/PuppetServer.yaml
View File

@ -14,7 +14,7 @@ Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.puppet =: org.openstack.ci_cd_pipeline_murano_app.puppet
conf: io.murano.configuration conf: io.murano.configuration
sys: io.murano.system 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 puppet: org.openstack.ci_cd_pipeline_murano_app.puppet
Name: PuppetServer Name: PuppetServer

2
murano-apps/CiCdUtils/package/Classes/net/Hosts.yaml → murano-apps/Puppet/package/Classes/net/Hosts.yaml
View File

@ -1,5 +1,5 @@
Namespaces: Namespaces:
=: org.openstack.ci_cd_pipeline_murano_app.utils.net =: org.openstack.ci_cd_pipeline_murano_app.puppet.net
std: io.murano std: io.murano
res: io.murano.resources res: io.murano.resources
sys: io.murano.system sys: io.murano.system

3
murano-apps/Puppet/package/manifest.yaml
View File

@ -10,11 +10,10 @@ Description: |
Author: 'Mirantis, Inc' Author: 'Mirantis, Inc'
Tags: [Server, Puppet] Tags: [Server, Puppet]
Classes: 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.PuppetInstance: PuppetInstance.yaml
org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetServer: PuppetServer.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.PuppetClient: PuppetClient.yaml
org.openstack.ci_cd_pipeline_murano_app.puppet.Hiera: Hiera.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.YamlTool: YamlTool.yaml
org.openstack.ci_cd_pipeline_murano_app.puppet.YamlFile: YamlFile.yaml org.openstack.ci_cd_pipeline_murano_app.puppet.YamlFile: YamlFile.yaml
Require:
org.openstack.ci_cd_pipeline_murano_app.utils.CiCdUtils: