Merge branch 'master' of github.com:brooklyncentral/clocker into release/1.1.x

* 'master' of github.com:brooklyncentral/clocker: (85 commits)
  Fix imports
  Improved stop logic
  Skip bridge deletion if not found
  Fix host creation when no strategy succeeds
  Make HAProxy URI accessible
  Move hostname customizer
  Synchronization for atomic deletion and use etcdctl to count containers
  Set hostname properly in container location
  Also remove bridge network and set DNS name correctly
  Delete networks when no longer required
  Tidying up blueprints
  Add locking on bridge network creation
  Fix typo in class name
  Change period for service.isUp check to 30s
  Check kernel version and storage module before updating kernel
  Remove references to boot2docker
  Make hostname customizer available as config option
  Fix HAProxy configuration
  Added openStdin option to jclouds Docker driver
  Remove Docker applications entity
  ...

Conflicts:
	clocker.bom
	dist/src/main/assembly/conf/brooklyn/default.catalog.bom
	dist/src/main/assembly/files/blueprints/docker-cloud-calico.yaml
	dist/src/main/assembly/files/blueprints/docker-cloud-weave.yaml
	dist/src/main/assembly/files/blueprints/docker-host.yaml
	docker/src/main/java/clocker/docker/entity/DockerHost.java
	docker/src/main/java/clocker/docker/entity/DockerInfrastructure.java
	jsgui/pom.xml

Author: grkvlt

.buildscript/deploy_snapshot.sh

@@ -6,7 +6,7 @@
 # http://benlimmer.com/2013/12/26/automatically-publish-javadoc-to-gh-pages-with-travis-ci/
 
 SLUG="brooklyncentral/clocker"
-JDK="oraclejdk7"
+JDK="oraclejdk8"
 BRANCH="master"
 
 set -e

.travis.yml

@@ -12,16 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sudo: false
+sudo: required
 language: java
 jdk:
   - oraclejdk8
 
-script: travis_wait 60 mvn clean install -U --settings dist/target/test-classes/travis_maven_settings.xml -P QA -Ds3-upload.destination=brooklyn-clocker-QA-${TRAVIS_BUILD_NUMBER}-${TRAVIS_COMMIT}-dist.tar.gz -Ds3-upload.accessKey=$AWS_IDENTITY -Ds3-upload.secretKey=$AWS_CREDENTIAL  -Dbrooklyn-test.localPropertiesAdditions="brooklyn.location.jclouds.softlayer.identity=$SOFTLAYER_USERNAME,brooklyn.location.jclouds.softlayer.credential=$SOFTLAYER_KEY,brooklyn.location.jclouds.aws-ec2.identity=$AWS_IDENTITY,brooklyn.location.jclouds.aws-ec2.credential=$AWS_CREDENTIAL" -Dbrooklyn-test.ampTestClusterPassword=$AMP_CLUSTER_PASSWORD -Dbrooklyn-test.distributionUrl=https://s3-eu-west-1.amazonaws.com/clocker-latest/brooklyn-clocker-QA-${TRAVIS_BUILD_NUMBER}-${TRAVIS_COMMIT}-dist.tar.gz
+install: true
+before_script:
+  - ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q
+  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+  - echo "Host localhost" >> /home/travis/.ssh/config
+  - echo "    StrictHostKeyChecking no" >> /home/travis/.ssh/config
+  - ssh-keyscan -t rsa localhost >> ~/.ssh/known_hosts
+  - chmod g-rw,o-rw /home/travis/.ssh/*
+  - mkdir -p ~/.brooklyn/docker-certs
+
+script:
+  - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xmx2469m -XX:MaxPermSize=512m"
+  - mkdir -p dist/target/brooklyn-maven-plugin/
+  - touch dist/target/brooklyn-maven-plugin/brooklyn.debug.log
+  - mvn -q clean install -DskipTests
+  - travis_wait 60 mvn -q verify -Pintegration -Dsoftlayer.identity=$SOFTLAYER_IDENTITY -Dsoftlayer.credential=$SOFTLAYER_CREDENTIAL
 
 after_success:
   - .buildscript/deploy_snapshot.sh
 
+after_failure:
+  - cat dist/target/brooklyn-maven-plugin/brooklyn.debug.log
+
 env:
   global:
   - secure: "BrRh52Ae8fkDqBRGOgFCi89DKDtTWnvZju3K1ntV0kC0nP0pIdKKKgCKZC9u8EmFYF8HZnHagqn3VSRX2+tASwo0xauY0urV4GlMUp38+Dnzt1Kg9XKL/m6aQdEu+EjhMm6KCar5CKZ1TdO36RWZdY6yM/0QZMSS6HqrdlDc8eo="
@@ -36,7 +54,11 @@ env:
 #  Softlayer
   - secure: "HDTN8nYiOx+B8Wyvd/fcJGnTLq3zHx+56MhZGtfJN4DANObsLzGO24tO2zz23Gqu94Ivwz5VRKpScY8ZKwML+kcwajUUCtRQAnbJLRYCdZBct5/aaqbRAvfDvxgUPOJsLppInNGP7zSuAZoWkjWkP3cRP1GVgELDY6++wYrNa4+z+qixsm5Is4Df1q/LV+v7xOGZGCL2nd2dIHGdwWbMf+0fNu/IU6i9hi/b6YpmdmTIUi/0Dda3UtquZlnrnmml5FsU+mo+ZykLVrKn0/B+3U6seKTI+vkYtM+qlcX0RwSk3/hudBP0Nj9doZ16NOelVP1r7u9V0MR1Xt6obHKLxYlk/f/Uvzmv/TfhbY8UMEK0HOSSa1SsO5fYwXG1qaOzdRbdrXCJS2yGpn8P8cyN/g5GElSg7KMVFTuvSJ94xmPB6uUm9iXUdepYwfX2YhCBU3wKJkzU1xlTTXBa/rbAYUZ3mY9Le1kaItz4Ce6mPuikFfoWSX6XYEZHAzZoGN1TikA+xGmRSnlOqHsEb1MymWuuWsyfI3Euwh6mlvLTqod2GkzJRt4fAqKyVN2GQCUM7maF2YP0BSGEcGN0+YAdYwrT3NTm3yqcnbXdcxUXeY48O+jm1ObUeH2X6Sz/XTZC/pp4xGNy7oQtHbNPhhcK2i4ZBZpgvjFO7qNN0Ke7HLY="
   - secure: "hPkb8z84KYgPLy6uDSx3gcNgg2jxD6tlSS4nk3j3uEzz5QwJThglPUM1plerHrPFTqTDpZ5mOx+dWMxU6H81Yk2NZzV3JG2Ne0aSk69k6roD3LqGxPrbh3YpFr6go29QNgC971UuJJekM/RodBCE1Vjon4k+FkY1Ash2rKJrovFMhqP51NYqPysXxEDjJhYM7cLaJZV2SQ2jlPYXUAd5J4tgrCI1rOIa5gquiExIB868HDRF2GiFwqHqtYA/Y5npJMvpISvk70L3/6S9bqSw9vOvgFFMxmhKinrpDktN+Bm3kPWnNmx7pMrOFrQ46j6DoOViHpoGrqIDZbQoljCUst76oU82lHQZrkxTCx3bE9dc2atCg9NIWwTO4Pf31mjZ1uytNFNnqXK/UTwXUkJP908g5oDeB2JmbacFKJkPkTjc+diV96bm2YyLASzvKN1fT/7pftySRZ73Ngt2NSjdO62dx6xFZ6egP0P7vsEW+hrxPPjEfyjB2QEWr4EY7v1DZ47PU2mhbjFlaaA7sRuSQ5dO1vsyBz4s9OmsuihzlaxC1mYoOXrIItyD/+58Xyy3s6CpFqbSpaeQK5dFRNnhYeQh/rQIVYuj3CLk8SNIBPfTcnoGRq7rgWDQOlTS7Y0yyF7ZINIx5HmeTP9uLy28cO+8pbhj5Z2H09vDEO8ORwI="
-
+# brooklyn.properties placeholders
+  # SOFTALYER_IDENTITY=identity
+  - secure: "PLv7B8XRUBGTTw+iXJ7H8+4ltThrL8P3Y7M5WKVgwwR2y84lLsqk3gcpPKj2+U3LtsGSg5sWqMXfHSLW79lST6S6JDZ/kXNi78YIfOYobR8at+efO7GoaRp/Qo0ticEvJUz4uSyZ69Nm7gjd0bxd4X/CbpG8wZjgt4RUYW6ny8k="
+  # SOFTALYER_CREDENTIAL=credential
+  - secure: "F/X34P2NlY/Efsmopr9U8E9Ewt3UpQguXZg/XmNYyClgwo3giC/iAkrnlEvwAGx1IeFn+QlYss8tsBn8za5IrquQKEZ2LiU8ommAx3RJdW2p1Pk6X5fhtz6kkJ3cHY/AvrJWs/bMxqQ2JcTWAfUkQKLH/6wxGy36HIZUpThdxIo="
 
 
 cache:

README.md

@@ -79,8 +79,8 @@ brooklyn.location.named.Amazon-Ireland = jclouds:aws-ec2:eu-west-1
 ```
 
 For more information on setting up locations, including supplying cloud provider credentials, see the
-[_Setting up Locations_ section of Brooklyn Getting Started](https://brooklyn.incubator.apache.org/quickstart/#configuring-a-location),
-and the more detailed [locations guide](https://brooklyn.incubator.apache.org/v/0.8.0-incubating/use/guide/locations/index.html).<!-- BROOKLYN_VERSION -->
+[_Setting up Locations_ section of Brooklyn Getting Started](https://brooklyn.apache.org/quickstart/#configuring-a-location),
+and the more detailed [locations guide](https://brooklyn.apache.org/v/0.9.0/use/guide/locations/index.html).<!-- BROOKLYN_VERSION -->
 The Brooklyn documentation also covers setting up security for the web-console, and configuring users
 and passwords.
 
@@ -94,7 +94,7 @@ available in the Locations drop-down list when adding new applications. Simply s
 and it will use Docker containers instead of virtual machines.
 
 For more information on deploying applications from the Brooklyn catalog, see
-[Getting Started - Policies and Catalogs](https://brooklyn.incubator.apache.org/quickstart/policies-and-catalogs.html).
+[Getting Started - Policies and Catalogs](https://brooklyn.apache.org/quickstart/policies-and-catalogs.html).
 
 You can also paste a YAML blueprint into the _YAML_ tab of the _Add Application_ dialog, as follows:
 ```JS
@@ -137,9 +137,9 @@ download on [Amazon S3](http://clocker-latest.s3-website-eu-west-1.amazonaws.com
 ## Getting involved
 
 Clocker is [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) licensed, and builds on  the
-[Apache Brooklyn](http://brooklyn.incubator.apache.org/) project. Please get involved and join the 
+[Apache Brooklyn](http://brooklyn.apache.org/) project. Please get involved and join the 
 discussion on [Freenode](http://freenode.net/), IRC `#brooklyncentral` or the Apache Brooklyn 
-community [mailing list](https://brooklyn.incubator.apache.org/community/). We also maintain a
+community [mailing list](https://brooklyn.apache.org/community/). We also maintain a
 [Trello](https://trello.com/b/lhS7ltyi/clocker) board with the current roadmap and active tasks.
 
 ### Documentation

clocker.bom

@@ -32,27 +32,27 @@ brooklyn.catalog:
   - id: docker-infrastructure
     name: "Docker Infrastructure"
     item:
-      type: brooklyn.entity.container.docker.DockerInfrastructure
+      type: clocker.docker.entity.DockerInfrastructure
       brooklyn.config:
-        docker.version: 1.9.1 # DOCKER_VERSION
+        docker.version: 1.10.3 # DOCKER_VERSION
         entity.dynamicLocation.name: "my-docker-cloud"
         docker.container.cluster.headroom.count: 4
         docker.policy.ha.enable: false
         docker.container.strategies:
         - $brooklyn:object:
-            type: brooklyn.location.docker.strategy.MaxContainersPlacementStrategy
+            type: clocker.docker.location.strategy.MaxContainersPlacementStrategy
             brooklyn.config:
               maxContainers: 16
         - $brooklyn:object:
-            type: brooklyn.location.docker.strategy.BreadthFirstPlacementStrategy
+            type: clocker.docker.location.strategy.BreadthFirstPlacementStrategy
         docker.host.spec:
           $brooklyn:entitySpec:
             type: docker-host
 
   - id: docker-host
     name: "Docker Host"
     item:
-      type: brooklyn.entity.container.docker.DockerHost
+      type: clocker.docker.entity.DockerHost
       brooklyn.config:
         docker.host.driver.storage: overlay
         docker.host.nameFormat: "docker-%2$d"
@@ -68,49 +68,56 @@ brooklyn.catalog:
   - id: docker-container
     name: "Docker Container"
     item:
-      type: brooklyn.entity.container.docker.DockerContainer
+      type: clocker.docker.entity.container.DockerContainer
       brooklyn.config:
         docker.container.nameFormat: "container-%2$02x"
 
   - id: calico-network
     name: "Calico Network"
     item:
-      type: brooklyn.networking.sdn.calico.CalicoNetwork
+      type: clocker.docker.networking.entity.sdn.calico.CalicoNetwork
       brooklyn.config:
-        calico.version: 0.4.9
+        calico.version: 0.19.0
         sdn.agent.spec:
           $brooklyn:entitySpec:
             type: calico-node
 
   - id: calico-node
     name: "Calico Node"
     item:
-      type: brooklyn.networking.sdn.calico.CalicoNode
+      type: clocker.docker.networking.entity.sdn.calico.CalicoNode
 
-  - id: etcd-cluster
-    name: "Etcd Cluster"
+  - id: calico-module
+    name: "Calico Network Module"
     item:
-      type: brooklyn.entity.nosql.etcd.EtcdCluster
+      type: clocker.mesos.networking.entity.sdn.calico.CalicoModule
       brooklyn.config:
-        etcd.version: 2.0.11
-        etcd.node.spec:
-          $brooklyn:entitySpec:
-            type: etcd-node
+        calico.version: 0.8.0
 
   - id: etcd-node
     name: "Etcd Node"
     item:
-      type: brooklyn.entity.nosql.etcd.EtcdNode
+      type: org.apache.brooklyn.entity.nosql.etcd.EtcdNode
 
   - id: etcd-proxy
     name: "Etcd Proxy"
     item:
-      type: brooklyn.entity.nosql.etcd.EtcdProxy
+      type: org.apache.brooklyn.entity.nosql.etcd.EtcdProxy
+
+  - id: etcd-cluster
+    name: "Etcd Cluster"
+    item:
+      type: org.apache.brooklyn.entity.nosql.etcd.EtcdCluster
+      brooklyn.config:
+        etcd.version: 2.3.1
+        etcd.node.spec:
+          $brooklyn:entitySpec:
+            type: etcd-node
 
   - id: weave-network
     name: "Weave Network"
     item:
-      type: brooklyn.networking.sdn.weave.WeaveNetwork
+      type: clocker.docker.networking.entity.sdn.weave.WeaveNetwork
       brooklyn.config:
         weave.version: 1.1.2
         sdn.agent.spec:
@@ -120,31 +127,45 @@ brooklyn.catalog:
   - id: weave-router
     name: "Weave Router"
     item:
-      type: brooklyn.networking.sdn.weave.WeaveContainer
+      type: clocker.docker.networking.entity.sdn.weave.WeaveRouter
+
+  - id: overlay-network
+    name: "Docker Overlay Network"
+    item:
+      type: clocker.docker.networking.entity.sdn.overlay.OverlayNetwork
+      brooklyn.config:
+        sdn.agent.spec:
+          $brooklyn:entitySpec:
+            type: overlay-plugin
+
+  - id: overlay-plugin
+    name: "Docker Overlay Plugin"
+    item:
+      type: clocker.docker.networking.entity.sdn.overlay.OverlayPlugin
 
   - id: docker-registry
     name: "Docker Registry"
     services:
-    - type: brooklyn.entity.container.docker.registry.DockerRegistry
+    - type: clocker.docker.entity.container.registry.DockerRegistry
       brooklyn.config:
         docker.registry.port: 5000
 
   - id: mesos-cluster
     name: "Mesos Cluster"
     item:
-      type: brooklyn.entity.mesos.MesosCluster
+      type: clocker.mesos.entity.MesosCluster
       brooklyn.config:
         entity.dynamicLocation.name: "my-mesos-cluster"
 
   - id: marathon-framework
     name: "Marathon Framework"
     item:
-      type: brooklyn.entity.mesos.framework.marathon.MarathonFramework
+      type: clocker.mesos.entity.framework.marathon.MarathonFramework
 
-  - id: docker-cloud
+  - id: docker-cloud-single
     name: "Clocker"
     description: |
-      Docker Cloud infrastructure
+      Single Docker host without networking
     iconUrl: classpath://docker-logo.png
     itemType: template
     item:
@@ -155,11 +176,11 @@ brooklyn.catalog:
           docker.container.cluster.headroom.count: 0
           docker.container.strategies:
           - $brooklyn:object:
-              type: brooklyn.location.docker.strategy.MaxContainersPlacementStrategy
+              type: clocker.docker.location.strategy.MaxContainersPlacementStrategy
               brooklyn.config:
                 maxContainers: 32
           - $brooklyn:object:
-              type: brooklyn.location.docker.strategy.DepthFirstPlacementStrategy
+              type: clocker.docker.location.strategy.DepthFirstPlacementStrategy
           sdn.enable: false
 
   - id: docker-cloud-calico
@@ -213,6 +234,30 @@ brooklyn.catalog:
                     brooklyn.config:
                       docker.container.nameFormat: "weave-%2$02x"
 
+  - id: docker-cloud-overlay
+    name: "Clocker with Docker Overlay"
+    description: |
+      Docker Cloud infrastructure with Docker overlay networking
+    iconUrl: classpath://docker-logo.png
+    itemType: template
+    item:
+      services:
+      - type: docker-infrastructure
+        brooklyn.config:
+          sdn.enable: true
+          sdn.provider.spec:
+            $brooklyn:entitySpec:
+              type: overlay-network
+          docker.host.spec:
+            $brooklyn:entitySpec:
+              type: docker-host
+              brooklyn.config:
+                docker.container.spec:
+                  $brooklyn:entitySpec:
+                    type: docker-container
+                    brooklyn.config:
+                      docker.container.nameFormat: "docker-%2$02x"
+
   - id: external-mesos-cluster
     name: "External Mesos Cluster"
     description: |
@@ -225,4 +270,26 @@ brooklyn.catalog:
         brooklyn.config:
           mesos.url: "http://localhost:5050/"
 
+  - id: haproxy-controller
+    name: "HAProxy"
+    description: |
+      HAProxy load balancer entity.
+    item:
+      type: org.apache.brooklyn.entity.proxy.haproxy.HAProxyController
+      brooklyn.config:
+        docker.image.name: haproxy
+        docker.useSsh: false
+        docker.image.commands:
+        - "/bin/bash"
+        docker.container.interactive: true
+        docker.container.openPorts.configKeys:
+        - $brooklyn:sensor("org.apache.brooklyn.entity.proxy.AbstractController", "proxy.http.port")
+        - $brooklyn:sensor("org.apache.brooklyn.entity.proxy.AbstractController", "proxy.https.port")
+        install.dir: /usr/local/sbin/
+        run.dir: /usr/local/etc/haproxy/
+        member.sensor.hostname: "host.subnet.hostname"
+        provisioning.properties:
+          entity.dynamicLocation.flags:
+            user: root
+
 # vim:ts=2:sw=2:ft=yaml:

console/pom.xml

@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
 
@@ -39,8 +39,11 @@
         <plugins>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
+                <version>${maven-war-plugin.version}</version>
                 <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
                     <webResources>
                         <resource>
                             <directory>src/main/webapp</directory>
@@ -60,11 +63,34 @@
                 </configuration>
             </plugin>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <skipTests>true</skipTests>
-              </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <supportedProjectTypes>
+                        <supportedProjectType>war</supportedProjectType>
+                    </supportedProjectTypes>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Version>${project.version}</Bundle-Version>
+                        <Web-ContextPath>/console</Web-ContextPath>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>