From 9b969745c077e50fc124e1f37d2cc0582c1aaa94 Mon Sep 17 00:00:00 2001 From: Alexey Khivin Date: Wed, 27 Apr 2016 16:00:46 +0300 Subject: [PATCH] ProjectConfig renamed to SystemConfig The first step to install project-config in the right way using Puppet. SystemConfig module function is to install all of the openstack-infra's puppet modules Change-Id: I504f3e10e68d7962dc26f8e072f3ed698cac9399 --- murano-apps/Gerrit/package/Classes/Gerrit.yaml | 2 +- murano-apps/Gerrit/package/manifest.yaml | 2 +- murano-apps/Jenkins/package/Classes/Jenkins.yaml | 4 ++-- murano-apps/Jenkins/package/manifest.yaml | 2 +- murano-apps/Nodepool/package/Classes/Nodepool.yaml | 2 +- murano-apps/Nodepool/package/manifest.yaml | 2 +- .../Classes/{ProjectConfig.yaml => SystemConfig.yaml} | 4 ++-- .../{ProjectConfig.template => SystemConfig.template} | 0 murano-apps/SystemConfig/package/manifest.yaml | 6 +++--- murano-apps/Zuul/package/Classes/Zuul.yaml | 4 ++-- murano-apps/Zuul/package/manifest.yaml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) rename murano-apps/SystemConfig/package/Classes/{ProjectConfig.yaml => SystemConfig.yaml} (81%) rename murano-apps/SystemConfig/package/Resources/{ProjectConfig.template => SystemConfig.template} (100%) diff --git a/murano-apps/Gerrit/package/Classes/Gerrit.yaml b/murano-apps/Gerrit/package/Classes/Gerrit.yaml index 32d1a28..592956b 100644 --- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml +++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml @@ -61,7 +61,7 @@ Methods: - $._environment.reporter.report($this, 'Deploying Gerrit') - - $this.systemConfig: new(puppet:ProjectConfig) + - $this.systemConfig: new(puppet:SystemСonfig) - $this.systemConfig.installOnTheNode($this.instance) - $.createConfiguration() diff --git a/murano-apps/Gerrit/package/manifest.yaml b/murano-apps/Gerrit/package/manifest.yaml index 948b410..5e37217 100644 --- a/murano-apps/Gerrit/package/manifest.yaml +++ b/murano-apps/Gerrit/package/manifest.yaml @@ -12,5 +12,5 @@ UI: ui.yaml Logo: logo.png Require: io.murano.opaas.OpenLDAP: - io.murano.opaas.puppet.ProjectConfig: + io.murano.opaas.puppet.SystemСonfig: io.murano.opaas.puppet.Puppet: diff --git a/murano-apps/Jenkins/package/Classes/Jenkins.yaml b/murano-apps/Jenkins/package/Classes/Jenkins.yaml index 5e12007..4f77cca 100644 --- a/murano-apps/Jenkins/package/Classes/Jenkins.yaml +++ b/murano-apps/Jenkins/package/Classes/Jenkins.yaml @@ -43,8 +43,8 @@ Methods: - $.instance.deploy() - $._environment.reporter.report($this, 'Jenkins VM {0} created'.format($.instance.openstackId)) - - $this.projectConfig: new(puppet:ProjectConfig) - - $this.projectConfig.installOnTheNode($this.instance) + - $this.systemСonfig: new(puppet:SystemСonfig) + - $this.systemСonfig.installOnTheNode($this.instance) - $resources: new(sys:Resources) - $template: $resources.yaml('DeployJenkins.template') diff --git a/murano-apps/Jenkins/package/manifest.yaml b/murano-apps/Jenkins/package/manifest.yaml index eeccccc..fe948d9 100644 --- a/murano-apps/Jenkins/package/manifest.yaml +++ b/murano-apps/Jenkins/package/manifest.yaml @@ -11,6 +11,6 @@ Classes: UI: ui.yaml Logo: logo.png Require: - io.murano.opaas.puppet.ProjectConfig: + io.murano.opaas.puppet.SystemСonfig: io.murano.opaas.puppet.Puppet: io.murano.opaas.OpenLDAP: diff --git a/murano-apps/Nodepool/package/Classes/Nodepool.yaml b/murano-apps/Nodepool/package/Classes/Nodepool.yaml index 578200e..cd1cfdd 100644 --- a/murano-apps/Nodepool/package/Classes/Nodepool.yaml +++ b/murano-apps/Nodepool/package/Classes/Nodepool.yaml @@ -43,7 +43,7 @@ Methods: - $._environment.reporter.report($this, 'Installing needed puppets for Nodepool...') - - $this.systemConfig: new(puppet:ProjectConfig) + - $this.systemConfig: new(puppet:SystemСonfig) - $this.systemConfig.installOnTheNode($this.instance) - $._environment.reporter.report($this, 'Waiting while Jenkins is being deployed...') diff --git a/murano-apps/Nodepool/package/manifest.yaml b/murano-apps/Nodepool/package/manifest.yaml index 138d41b..4797c1d 100644 --- a/murano-apps/Nodepool/package/manifest.yaml +++ b/murano-apps/Nodepool/package/manifest.yaml @@ -14,7 +14,7 @@ Classes: UI: ui.yaml Logo: logo.png Require: - io.murano.opaas.puppet.ProjectConfig: + io.murano.opaas.puppet.SystemСonfig: io.murano.opaas.puppet.Puppet: io.murano.opaas.Jenkins: # TODO(nmakhotkin): Add zuul to requirements. diff --git a/murano-apps/SystemConfig/package/Classes/ProjectConfig.yaml b/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml similarity index 81% rename from murano-apps/SystemConfig/package/Classes/ProjectConfig.yaml rename to murano-apps/SystemConfig/package/Classes/SystemConfig.yaml index 372ced6..30c4582 100644 --- a/murano-apps/SystemConfig/package/Classes/ProjectConfig.yaml +++ b/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml @@ -5,7 +5,7 @@ Namespaces: sys: io.murano.system puppet: io.murano.opaas.puppet -Name: ProjectConfig +Name: SystemConfig Methods: installOnTheNode: @@ -14,5 +14,5 @@ Methods: Contract: $.class(puppet:PuppetInstance) Body: - $resources: new(sys:Resources) - - $template: $resources.yaml('ProjectConfig.template') + - $template: $resources.yaml('SystemСonfig.template') - $instance.agent.call($template, $resources) diff --git a/murano-apps/SystemConfig/package/Resources/ProjectConfig.template b/murano-apps/SystemConfig/package/Resources/SystemConfig.template similarity index 100% rename from murano-apps/SystemConfig/package/Resources/ProjectConfig.template rename to murano-apps/SystemConfig/package/Resources/SystemConfig.template diff --git a/murano-apps/SystemConfig/package/manifest.yaml b/murano-apps/SystemConfig/package/manifest.yaml index c77df99..56bbf1f 100644 --- a/murano-apps/SystemConfig/package/manifest.yaml +++ b/murano-apps/SystemConfig/package/manifest.yaml @@ -1,13 +1,13 @@ Format: 1.0 Type: Library -FullName: io.murano.opaas.puppet.ProjectConfig -Name: ProjectConfig +FullName: io.murano.opaas.puppet.SystemСonfig +Name: SystemСonfig Description: | Openstack-CI utilities Author: 'Mirantis, Inc' Tags: [CI] Classes: - io.murano.opaas.puppet.ProjectConfig: ProjectConfig.yaml + io.murano.opaas.puppet.SystemСonfig: SystemСonfig.yaml Logo: logo.png Require: io.murano.opaas.puppet.Puppet: diff --git a/murano-apps/Zuul/package/Classes/Zuul.yaml b/murano-apps/Zuul/package/Classes/Zuul.yaml index 75bb889..e053bce 100644 --- a/murano-apps/Zuul/package/Classes/Zuul.yaml +++ b/murano-apps/Zuul/package/Classes/Zuul.yaml @@ -56,8 +56,8 @@ Methods: - $.instance.deploy() - $._environment.reporter.report($this, 'Zuul VM {0} is created'.format($.instance.openstackId)) - - $this.projectConfig: new(puppet:ProjectConfig) - - $this.projectConfig.installOnTheNode($this.instance) + - $this.systemСonfig: new(puppet:SystemСonfig) + - $this.systemСonfig.installOnTheNode($this.instance) - $.instance.setHieraValue('project_config_repo', 'https://review.fuel-infra.org/open-paas/project-config') - $.instance.setHieraValue('gerrit_server', $.gerrit_server) diff --git a/murano-apps/Zuul/package/manifest.yaml b/murano-apps/Zuul/package/manifest.yaml index 71cca3e..ab0ea60 100644 --- a/murano-apps/Zuul/package/manifest.yaml +++ b/murano-apps/Zuul/package/manifest.yaml @@ -11,4 +11,4 @@ Classes: UI: ui.yaml Require: io.murano.opaas.puppet.Puppet: - io.murano.opaas.puppet.ProjectConfig: \ No newline at end of file + io.murano.opaas.puppet.SystemСonfig: \ No newline at end of file