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
This commit is contained in:
Alexey Khivin 2016-04-27 16:00:46 +03:00 committed by Sergey Kraynev
parent 12fbdc9873
commit 9b969745c0
11 changed files with 15 additions and 15 deletions

View File

@ -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()

View File

@ -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:

View File

@ -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')

View File

@ -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:

View File

@ -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...')

View File

@ -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.

View File

@ -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)

View File

@ -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:

View File

@ -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)

View File

@ -11,4 +11,4 @@ Classes:
UI: ui.yaml
Require:
io.murano.opaas.puppet.Puppet:
io.murano.opaas.puppet.ProjectConfig:
io.murano.opaas.puppet.SystemСonfig: