diff --git a/murano-apps/Jenkins/package/Classes/Jenkins.yaml b/murano-apps/Jenkins/package/Classes/Jenkins.yaml index 4f77cca..c3f0661 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.systemСonfig: new(puppet:SystemСonfig) - - $this.systemСonfig.installOnTheNode($this.instance) + - $this.systemConfig: new(puppet:SystemConfig) + - $this.systemConfig.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 fe948d9..f3d2dec 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.SystemСonfig: + io.murano.opaas.puppet.SystemConfig: 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 cd1cfdd..607be40 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:SystemСonfig) + - $this.systemConfig: new(puppet:SystemConfig) - $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 4797c1d..6e62ed0 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.SystemСonfig: + io.murano.opaas.puppet.SystemConfig: io.murano.opaas.puppet.Puppet: io.murano.opaas.Jenkins: # TODO(nmakhotkin): Add zuul to requirements. diff --git a/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml b/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml index 30c4582..a2d0553 100644 --- a/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml +++ b/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml @@ -14,5 +14,5 @@ Methods: Contract: $.class(puppet:PuppetInstance) Body: - $resources: new(sys:Resources) - - $template: $resources.yaml('SystemСonfig.template') + - $template: $resources.yaml('SystemConfig.template') - $instance.agent.call($template, $resources) diff --git a/murano-apps/SystemConfig/package/manifest.yaml b/murano-apps/SystemConfig/package/manifest.yaml index 56bbf1f..b81c086 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.SystemСonfig -Name: SystemСonfig +FullName: io.murano.opaas.puppet.SystemConfig +Name: SystemConfig Description: | Openstack-CI utilities Author: 'Mirantis, Inc' Tags: [CI] Classes: - io.murano.opaas.puppet.SystemСonfig: SystemСonfig.yaml + io.murano.opaas.puppet.SystemConfig: SystemConfig.yaml Logo: logo.png Require: io.murano.opaas.puppet.Puppet: