You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by aledsage <gi...@git.apache.org> on 2017/09/16 10:00:57 UTC
[GitHub] brooklyn-library pull request #129: Move chef from brooklyn-software-base to...
GitHub user aledsage opened a pull request:
https://github.com/apache/brooklyn-library/pull/129
Move chef from brooklyn-software-base to own module
This contains no code changes. It just moves files to the new locations, and moves snippets of some files (e.g. catalog.bom, blueprint.xml and `org.apache.brooklyn.core.resolve.entity.EntitySpecResolver`.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/brooklyn-library move-chef-to-library
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/brooklyn-library/pull/129.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #129
----
commit 50a175200d963e5917f8331cd594caf2fad4fa46
Author: Aled Sage <al...@gmail.com>
Date: 2017-09-15T19:48:28Z
Move chef from brooklyn—software-base to own module
----
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by tbouron <gi...@git.apache.org>.
Github user tbouron commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
> jenkins failed with the error:
See my previous comment
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by tbouron <gi...@git.apache.org>.
Github user tbouron commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
retest this please
---
[GitHub] brooklyn-library pull request #129: Move chef from brooklyn-software-base to...
Posted by tbouron <gi...@git.apache.org>.
Github user tbouron commented on a diff in the pull request:
https://github.com/apache/brooklyn-library/pull/129#discussion_r139284272
--- Diff: software/cm/chef/src/main/resources/catalog.bom ---
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+ version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION
+ itemType: entity
+ items:
+ - id: org.apache.brooklyn.entity.chef.ChefEntity
+ item:
+ type: org.apache.brooklyn.entity.chef.ChefEntity
+ name: Chef Entity
+ description: Software managed by Chef
--- End diff --
Shouldn't you add directly the `iconUrl` field to match the changes made in #128 ?
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
@tbouron changes made; ready for review + (hopefully!) merge.
@tbouron For why we have ansible, chef and salt in different modules (versus databases in one module), we don't have a hard-and-fast rule. However, with hindsight having entities like databases in the same brooklyn module was a mistake. Their release cadence and versioning are tied to that of brooklyn-core. They should have been in a community-contributed place like "brooklyncentral" in my opinion. And should have been in separate modules there.
For ansible, chef etc - though they are solving a similar problem, they are very different integrations so I think it's good to separate them into different modules.
The most compelling immediate answer though is that ansible and salt area already in different modules, so we're not going to combine them! And we should follow the same pattern for chef.
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by tbouron <gi...@git.apache.org>.
Github user tbouron commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
@aledsage Just tested this with https://github.com/apache/brooklyn-server/pull/826, works great but requires to be rebased on the latest master + change the version in pom.xml to `0.13.0-SNAPSHOT`
After that, good to merge đź‘Ť
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
retest this please
---
[GitHub] brooklyn-library pull request #129: Move chef from brooklyn-software-base to...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on a diff in the pull request:
https://github.com/apache/brooklyn-library/pull/129#discussion_r139619615
--- Diff: software/cm/chef/src/main/resources/catalog.bom ---
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+ version: "0.12.0-SNAPSHOT" # BROOKLYN_VERSION
+ itemType: entity
+ items:
+ - id: org.apache.brooklyn.entity.chef.ChefEntity
+ item:
+ type: org.apache.brooklyn.entity.chef.ChefEntity
+ name: Chef Entity
+ description: Software managed by Chef
--- End diff --
@tbouron was planning to add iconUrl as a separate step (it needs added to `src/main/resources`, so we can reference it offline). But I'll do that now in a second commit in this PR.
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
jenkins failed with the error:
```
java.io.IOException: remote file operation failed: /home/jenkins/jenkins-slave/workspace/brooklyn-library-pull-requests at hudson.remoting.Channel@31056a0f:H25: hudson.remoting.ProxyException: hudson.maven.MavenModuleSetBuild$MavenExecutionException: org.apache.maven.project.ProjectBuildingException: Some problems were encountered while processing the POMs:
[FATAL] Non-resolvable parent POM: Could not find artifact org.apache.brooklyn:brooklyn-library:pom:0.13.0-SNAPSHOT and 'parent.relativePath' points at wrong local POM @ line 30, column 13
```
I presume this is temporary, until jenkins has built brooklyn-library master etc, so that 0.13.0-SNAPSHOT of everything is in apache's maven snapshot repository.
Will kick off a "retest this please" again later.
---
[GitHub] brooklyn-library pull request #129: Move chef from brooklyn-software-base to...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/brooklyn-library/pull/129
---
[GitHub] brooklyn-library issue #129: Move chef from brooklyn-software-base to own mo...
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-library/pull/129
retest this please
---