Merge "Rename prefix for FQN of packages"

2016-05-26 12:55:18 +00:00 · 2016-05-26 12:55:18 +00:00 · d123f4087e
commit d123f4087e
parent 717898e083 98e7e0d260
22 changed files with 81 additions and 81 deletions
--- a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
+++ b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
@ -1,10 +1,10 @@
 Namespaces:
-  =: io.murano.opaas
+  =: org.openstack.ci_cd_pipeline_murano_app
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  opaas: io.murano.opaas
-  puppet: io.murano.opaas.puppet
+  ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet

 Name: CiCdEnvironment

@ -12,13 +12,13 @@ Extends: std:Application

 Properties:
  ldap:
-    Contract: $.class(opaas:OpenLDAP)
+    Contract: $.class(ci_cd_pipeline_murano_app:OpenLDAP)
    Usage: Out
  gerrit:
-    Contract: $.class(opaas:Gerrit)
+    Contract: $.class(ci_cd_pipeline_murano_app:Gerrit)
    Usage: Out
  jenkins:
-    Contract: $.class(opaas:Jenkins)
+    Contract: $.class(ci_cd_pipeline_murano_app:Jenkins)
    Usage: Out

  ldapRootUser:
@ -69,7 +69,7 @@ Methods:
              keyname => $.keyname,
              availabilityZone => $.availabilityZone,
              assignFloatingIp => $.assignFloatingIp)
-          - $this.ldap: new(opaas:OpenLDAP, $._environment,
+          - $this.ldap: new(ci_cd_pipeline_murano_app:OpenLDAP, $._environment,
              name => 'OpenLDAP',
              instance => $ldapInstance,
              domain => 'infra.local',
@ -91,7 +91,7 @@ Methods:
              keyname => $.keyname,
              availabilityZone => $.availabilityZone,
              assignFloatingIp => $.assignFloatingIp)
-          - $this.gerrit: new(opaas:Gerrit, $this,
+          - $this.gerrit: new(ci_cd_pipeline_murano_app:Gerrit, $this,
              name => 'Gerrit',
              instance => $gerritInstance,
              ldap => $this.ldap)
@ -111,7 +111,7 @@ Methods:
              keyname => $.keyname,
              availabilityZone => $.availabilityZone,
              assignFloatingIp => $.assignFloatingIp)
-          - $this.jenkins: new(opaas:Jenkins, $._environment,
+          - $this.jenkins: new(ci_cd_pipeline_murano_app:Jenkins, $._environment,
              name => 'Jenkins',
              instance => $jenkinsInstance,
              ldap => $this.ldap,
--- a/murano-apps/CiCdEnvironment/package/UI/ui.yaml
+++ b/murano-apps/CiCdEnvironment/package/UI/ui.yaml
@ -2,7 +2,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.opaas.CiCdEnvironment
+    type: org.openstack.ci_cd_pipeline_murano_app.CiCdEnvironment
  name: 'CI/CD'
  ldapRootUser: $.appConfiguration.ldapRootUser
  ldapRootPass: $.appConfiguration.ldapRootPass
--- a/murano-apps/CiCdEnvironment/package/manifest.yaml
+++ b/murano-apps/CiCdEnvironment/package/manifest.yaml
@ -1,17 +1,17 @@
 Format: 1.0
 Type: Application
-FullName: io.murano.opaas.CiCdEnvironment
+FullName: org.openstack.ci_cd_pipeline_murano_app.CiCdEnvironment
 Name: CI/CD
 Description: |
 The One-click CI/CD installer
 Author: 'Mirantis, Inc'
 Tags: [CI]
 Classes:
-  io.murano.opaas.CiCdEnvironment: CiCdEnvironment.yaml
+  org.openstack.ci_cd_pipeline_murano_app.CiCdEnvironment: CiCdEnvironment.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
-  io.murano.opaas.OpenLDAP:
-  io.murano.opaas.Jenkins:
-  io.murano.opaas.Gerrit:
-  io.murano.opaas.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.OpenLDAP:
+  org.openstack.ci_cd_pipeline_murano_app.Jenkins:
+  org.openstack.ci_cd_pipeline_murano_app.Gerrit:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
--- a/murano-apps/Gerrit/package/Classes/Gerrit.yaml
+++ b/murano-apps/Gerrit/package/Classes/Gerrit.yaml
@ -1,10 +1,10 @@
 Namespaces:
-  =: io.murano.opaas
+  =: org.openstack.ci_cd_pipeline_murano_app
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  opaas: io.murano.opaas
-  puppet: io.murano.opaas.puppet
+  ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet

 Name: Gerrit

@ -19,7 +19,7 @@ Properties:
    Contract: $.string()
    Default: 'http://tarballs.openstack.org/ci/test/gerrit-v2.11.9.3.eb6e48d.war'
  ldap:
-    Contract: $.class(opaas:OpenLDAP)
+    Contract: $.class(ci_cd_pipeline_murano_app:OpenLDAP)

 Methods:
  initialize:
--- a/murano-apps/Gerrit/package/UI/ui.yaml
+++ b/murano-apps/Gerrit/package/UI/ui.yaml
@ -2,13 +2,13 @@ Version: 2

 Application:
  ?:
-    type: io.murano.opaas.Gerrit
+    type: org.openstack.ci_cd_pipeline_murano_app.Gerrit
  name: $.appConfiguration.name
  warUrl: $.appConfiguration.warUrl
  ldap: $.appConfiguration.OpenLDAP
  instance:
    ?:
-      type: io.murano.opaas.puppet.PuppetInstance
+      type: org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance
    name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
    flavor: $.instanceConfiguration.flavor
    image: $.instanceConfiguration.osImage
@ -41,7 +41,7 @@ Forms:
            Enter the war version from Gerrit's site
            http://gerrit-releases.storage.googleapis.com/index.html
        - name: OpenLDAP
-          type: io.murano.opaas.OpenLDAP
+          type: org.openstack.ci_cd_pipeline_murano_app.OpenLDAP
          required: false
          description: >-
            Specify OpenLDAP domain for authentication
--- a/murano-apps/Gerrit/package/manifest.yaml
+++ b/murano-apps/Gerrit/package/manifest.yaml
@ -1,16 +1,16 @@
 Format: 1.0
 Type: Application
-FullName: io.murano.opaas.Gerrit
+FullName: org.openstack.ci_cd_pipeline_murano_app.Gerrit
 Name: Gerrit
 Description: |
  Gerrit provides web based code review and repository management for the Git version control system.
 Author: 'Mirantis, Inc'
 Tags: [Server, LDAP]
 Classes:
-  io.murano.opaas.Gerrit: Gerrit.yaml
+  org.openstack.ci_cd_pipeline_murano_app.Gerrit: Gerrit.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
-  io.murano.opaas.OpenLDAP:
-  io.murano.opaas.puppet.SystemConfig:
-  io.murano.opaas.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.OpenLDAP:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
--- a/murano-apps/Jenkins/package/Classes/Jenkins.yaml
+++ b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
@ -1,10 +1,10 @@
 Namespaces:
-  =: io.murano.opaas
+  =: org.openstack.ci_cd_pipeline_murano_app
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  opaas: io.murano.opaas
-  puppet: io.murano.opaas.puppet
+  ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet

 Name: Jenkins

@ -16,7 +16,7 @@ Properties:
  ldap:
    Contract: $.class(OpenLDAP)
  gerrit:
-    Contract: $.class(opaas:Gerrit)
+    Contract: $.class(ci_cd_pipeline_murano_app:Gerrit)
  instance:
    Contract: $.class(puppet:PuppetInstance).notNull()
  cfplugin:
@ -181,7 +181,7 @@ Methods:
  configureGerritPlugin:
    Arguments:
      - gerrit:
-          Contract: $.class(opaas:Gerrit).notNull()
+          Contract: $.class(ci_cd_pipeline_murano_app:Gerrit).notNull()
    Body:
      - If: $gerrit.instance.assignFloatingIp
        Then:
--- a/murano-apps/Jenkins/package/UI/ui.yaml
+++ b/murano-apps/Jenkins/package/UI/ui.yaml
@ -2,7 +2,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.opaas.Jenkins
+    type: org.openstack.ci_cd_pipeline_murano_app.Jenkins
  name: $.appConfiguration.name
  ldap: $.appConfiguration.OpenLDAP
  gerrit: $.appConfiguration.Gerrit
@ -11,7 +11,7 @@ Application:
  gitEmail: $.appConfiguration.gitEmail
  instance:
    ?:
-      type: io.murano.opaas.puppet.PuppetInstance
+      type: org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance
    name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
    flavor: $.instanceConfiguration.flavor
    image: $.instanceConfiguration.osImage
@ -44,12 +44,12 @@ Forms:
          initial: true
          required: false
        - name: OpenLDAP
-          type: io.murano.opaas.OpenLDAP
+          type: org.openstack.ci_cd_pipeline_murano_app.OpenLDAP
          required: false
          description: >-
            Specify OpenLDAP domain for authentication
        - name: Gerrit
-          type: io.murano.opaas.Gerrit
+          type: org.openstack.ci_cd_pipeline_murano_app.Gerrit
          required: false
          description: >-
            Specify Gerrit app for auto user configuration.
--- a/murano-apps/Jenkins/package/manifest.yaml
+++ b/murano-apps/Jenkins/package/manifest.yaml
@ -1,17 +1,17 @@
 Format: 1.0
 Type: Application
-FullName: io.murano.opaas.Jenkins
+FullName: org.openstack.ci_cd_pipeline_murano_app.Jenkins
 Name: Jenkins
 Description: |
 Jenkins is an open source continuous integration tool written in Java.
 Author: 'Mirantis, Inc'
 Tags: [Server, Java, CI, Jenkins]
 Classes:
- io.murano.opaas.Jenkins: Jenkins.yaml
+ org.openstack.ci_cd_pipeline_murano_app.Jenkins: Jenkins.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
-  io.murano.opaas.puppet.SystemConfig:
-  io.murano.opaas.puppet.Puppet:
-  io.murano.opaas.OpenLDAP:
-  io.murano.opaas.Gerrit:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.OpenLDAP:
+  org.openstack.ci_cd_pipeline_murano_app.Gerrit:
--- a/murano-apps/Nodepool/package/Classes/Nodepool.yaml
+++ b/murano-apps/Nodepool/package/Classes/Nodepool.yaml
@ -1,10 +1,10 @@
 Namespaces:
-  =: io.murano.opaas
+  =: org.openstack.ci_cd_pipeline_murano_app
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  opaas: io.murano.opaas
-  puppet: io.murano.opaas.puppet
+  ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet

 Name: Nodepool

@ -16,7 +16,7 @@ Properties:
  name:
    Contract: $.string().notNull()
  jenkins:
-    Contract: $.class(opaas:Jenkins).notNull()
+    Contract: $.class(ci_cd_pipeline_murano_app:Jenkins).notNull()
  # TODO(nmakhotkin) Add zuul property.

 Methods:
--- a/murano-apps/Nodepool/package/UI/ui.yaml
+++ b/murano-apps/Nodepool/package/UI/ui.yaml
@ -2,12 +2,12 @@ Version: 2

 Application:
  ?:
-    type: io.murano.opaas.Nodepool
+    type: org.openstack.ci_cd_pipeline_murano_app.Nodepool
  name: $.appConfiguration.name
  jenkins: $.appConfiguration.Jenkins
  instance:
    ?:
-      type: io.murano.opaas.puppet.PuppetInstance
+      type: org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance
    name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
    flavor: $.instanceConfiguration.flavor
    image: $.instanceConfiguration.osImage
@ -33,7 +33,7 @@ Forms:
          initial: true
          required: false
        - name: Jenkins
-          type: io.murano.opaas.Jenkins
+          type: org.openstack.ci_cd_pipeline_murano_app.Jenkins
          required: true
          description: >-
            Specify Jenkins.
--- a/murano-apps/Nodepool/package/manifest.yaml
+++ b/murano-apps/Nodepool/package/manifest.yaml
@ -1,6 +1,6 @@
 Format: 1.0
 Type: Application
-FullName: io.murano.opaas.Nodepool
+FullName: org.openstack.ci_cd_pipeline_murano_app.Nodepool
 Name: Nodepool
 Description: |
 Nodepool is a system for launching single-use test nodes on demand based on
@ -10,11 +10,11 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Images, CI, Zuul, Jenkins]
 Classes:
- io.murano.opaas.Nodepool: Nodepool.yaml
+ org.openstack.ci_cd_pipeline_murano_app.Nodepool: Nodepool.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
-  io.murano.opaas.puppet.SystemConfig:
-  io.murano.opaas.puppet.Puppet:
-  io.murano.opaas.Jenkins:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.Jenkins:
 # TODO(nmakhotkin): Add zuul to requirements.
--- a/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml
+++ b/murano-apps/OpenLDAP/package/Classes/OpenLDAP.yaml
@ -1,9 +1,9 @@
 Namespaces:
-  =: io.murano.opaas
+  =: org.openstack.ci_cd_pipeline_murano_app
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  puppet: io.murano.opaas.puppet
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet


 Name: OpenLDAP
--- a/murano-apps/OpenLDAP/package/UI/ui.yaml
+++ b/murano-apps/OpenLDAP/package/UI/ui.yaml
@ -2,7 +2,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.opaas.OpenLDAP
+    type: org.openstack.ci_cd_pipeline_murano_app.OpenLDAP
  name: $.appConfiguration.name
  domain: $.appConfiguration.domain
  ldapRootUser: $.appConfiguration.ldapRootUser
@ -13,7 +13,7 @@ Application:
  ldapEmail: $.appConfiguration.ldapEmail
  instance:
    ?:
-      type: io.murano.opaas.puppet.PuppetInstance
+      type: org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance
    name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
    flavor: $.instanceConfiguration.flavor
    image: $.instanceConfiguration.osImage
--- a/murano-apps/OpenLDAP/package/manifest.yaml
+++ b/murano-apps/OpenLDAP/package/manifest.yaml
@ -1,14 +1,14 @@
 Format: 1.0
 Type: Application
-FullName: io.murano.opaas.OpenLDAP
+FullName: org.openstack.ci_cd_pipeline_murano_app.OpenLDAP
 Name: OpenLDAP
 Description: |
 OpenLDAP is an open source implementation of the Lightweight Directory Access Protocol.
 Author: 'Mirantis, Inc'
 Tags: [Server, LDAP]
 Classes:
- io.murano.opaas.OpenLDAP: OpenLDAP.yaml
+ org.openstack.ci_cd_pipeline_murano_app.OpenLDAP: OpenLDAP.yaml
 UI: ui.yaml
 Logo: logo.png
 Require:
-  io.murano.opaas.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
--- a/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
+++ b/murano-apps/Puppet/package/Classes/PuppetInstance.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-    =: io.murano.opaas.puppet
+    =: org.openstack.ci_cd_pipeline_murano_app.puppet
    res: io.murano.resources
    std: io.murano
    sys: io.murano.system
--- a/murano-apps/Puppet/package/manifest.yaml
+++ b/murano-apps/Puppet/package/manifest.yaml
@ -1,6 +1,6 @@
 Format: 1.0
 Type: Library
-FullName: io.murano.opaas.puppet.Puppet
+FullName: org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet
 Name: Puppet
 Description: |
 Puppet is an open-source configuration management tool. It runs on many
@ -9,4 +9,4 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Server, Puppet]
 Classes:
- io.murano.opaas.puppet.PuppetInstance: PuppetInstance.yaml
+ org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance: PuppetInstance.yaml
--- a/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml
+++ b/murano-apps/SystemConfig/package/Classes/SystemConfig.yaml
@ -1,9 +1,9 @@
 Namespaces:
-  =: io.murano.opaas.puppet
+  =: org.openstack.ci_cd_pipeline_murano_app.puppet
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  puppet: io.murano.opaas.puppet
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet

 Name: SystemConfig
 Properties:
--- 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.SystemConfig
+FullName: org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig
 Name: SystemConfig
 Description: |
 Openstack-CI utilities
 Author: 'Mirantis, Inc'
 Tags: [CI]
 Classes:
- io.murano.opaas.puppet.SystemConfig: SystemConfig.yaml
+ org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig: SystemConfig.yaml
 Logo: logo.png
 Require:
-  io.murano.opaas.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
--- a/murano-apps/Zuul/package/Classes/Zuul.yaml
+++ b/murano-apps/Zuul/package/Classes/Zuul.yaml
@ -1,10 +1,10 @@
 Namespaces:
-  =: io.murano.opaas
+  =: org.openstack.ci_cd_pipeline_murano_app
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
-  opaas: io.murano.opaas
-  puppet: io.murano.opaas.puppet
+  ci_cd_pipeline_murano_app: org.openstack.ci_cd_pipeline_murano_app
+  puppet: org.openstack.ci_cd_pipeline_murano_app.puppet
  conf: io.murano.configuration

 Name: Zuul
--- a/murano-apps/Zuul/package/UI/ui.yaml
+++ b/murano-apps/Zuul/package/UI/ui.yaml
@ -2,12 +2,12 @@ Version: 2

 Application:
  ?:
-    type: io.murano.opaas.Zuul
+    type: org.openstack.ci_cd_pipeline_murano_app.Zuul
  name: $.appConfiguration.name
  gerrit: $.appConfiguration.Gerrit
  instance:
    ?:
-      type: io.murano.opaas.puppet.PuppetInstance
+      type: org.openstack.ci_cd_pipeline_murano_app.puppet.PuppetInstance
    name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
    flavor: $.instanceConfiguration.flavor
    image: $.instanceConfiguration.osImage
@ -23,7 +23,7 @@ Forms:
          label: Application Name
          initial: Zuul
        - name: Gerrit
-          type: io.murano.opaas.Gerrit
+          type: org.openstack.ci_cd_pipeline_murano_app.Gerrit
          description: Gerrit Server
        - name: assignFloatingIP
          type: boolean
--- a/murano-apps/Zuul/package/manifest.yaml
+++ b/murano-apps/Zuul/package/manifest.yaml
@ -1,15 +1,15 @@
 Format: 1.0
 Type: Application
-FullName: io.murano.opaas.Zuul
+FullName: org.openstack.ci_cd_pipeline_murano_app.Zuul
 Name: Zuul
 Description: |
 Zuul is a pipeline oriented project gating and automation system.
 Author: 'Mirantis, Inc'
 Tags: [CI, Zuul]
 Classes:
- io.murano.opaas.Zuul: Zuul.yaml
+ org.openstack.ci_cd_pipeline_murano_app.Zuul: Zuul.yaml
 UI: ui.yaml
 Require:
-  io.murano.opaas.puppet.Puppet:
-  io.murano.opaas.puppet.SystemConfig:
-  io.murano.opaas.Gerrit:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.Puppet:
+  org.openstack.ci_cd_pipeline_murano_app.puppet.SystemConfig:
+  org.openstack.ci_cd_pipeline_murano_app.Gerrit: