no_entry: Merge resources into new location Signed-off-by: Andrew Donald Kennedy <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e5bf1a84 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e5bf1a84 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e5bf1a84 Branch: refs/heads/master Commit: e5bf1a84703347f3058492bb66a0e75c0a0559a9 Parents: 350d1fb Author: CloudsoftOps <[email protected]> Authored: Thu May 18 18:13:48 2017 +0100 Committer: Andrew Donald Kennedy <[email protected]> Committed: Fri May 19 14:03:37 2017 +0100 ---------------------------------------------------------------------- ...pache.brooklyn.api.location.LocationResolver | 3 +++ .../resources/OSGI-INF/blueprint/blueprint.xml | 22 ++++++++++++++++++++ .../resources/nginx-replication-controller.yaml | 20 ++++++++++++++++++ .../src/test/resources/nginx-service.yaml | 12 +++++++++++ ...pache.brooklyn.api.location.LocationResolver | 1 - .../resources/OSGI-INF/blueprint/blueprint.xml | 16 -------------- ...pache.brooklyn.api.location.LocationResolver | 1 - .../resources/OSGI-INF/blueprint/blueprint.xml | 15 ------------- .../src/test/resources/logback.xml | 5 ----- .../resources/nginx-replication-controller.yaml | 20 ------------------ .../src/test/resources/nginx-service.yaml | 12 ----------- ...pache.brooklyn.api.location.LocationResolver | 1 - .../resources/OSGI-INF/blueprint/blueprint.xml | 15 ------------- .../src/test/resources/logback.xml | 5 ----- 14 files changed, 57 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver new file mode 100644 index 0000000..88a0ec4 --- /dev/null +++ b/brooklyn-server/locations/container/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver @@ -0,0 +1,3 @@ +io.cloudsoft.amp.containerservice.dockerlocation.DockerLocationResolver +io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationResolver +io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationResolver http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml new file mode 100644 index 0000000..2275ce5 --- /dev/null +++ b/brooklyn-server/locations/container/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd";> + + + <bean id="dockerLocationResolver" scope="prototype" + class="io.cloudsoft.amp.containerservice.dockerlocation.DockerLocationResolver"/> + <bean id="kubernetesLocationResolver" scope="prototype" + class="io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationResolver"/> + <bean id="openshiftLocationResolver" scope="prototype" + class="io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationResolver"/> + + <service id="dockerLocationResolverService" ref="dockerLocationResolver" + interface="org.apache.brooklyn.api.location.LocationResolver"/> + <service id="kubernetesLocationResolverService" ref="kubernetesLocationResolver" + interface="org.apache.brooklyn.api.location.LocationResolver"/> + <service id="openshiftLocationResolverService" ref="openshiftLocationResolver" + interface="org.apache.brooklyn.api.location.LocationResolver"/> + +</blueprint> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/brooklyn-server/locations/container/src/test/resources/nginx-replication-controller.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/resources/nginx-replication-controller.yaml b/brooklyn-server/locations/container/src/test/resources/nginx-replication-controller.yaml new file mode 100644 index 0000000..6788a05 --- /dev/null +++ b/brooklyn-server/locations/container/src/test/resources/nginx-replication-controller.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: ReplicationController +metadata: + name: nginx-replication-controller + namespace: default +spec: + replicas: 2 + selector: + app: nginx + template: + metadata: + name: nginx + labels: + app: nginx + spec: + containers: + - name: nginx + image: nginx + ports: + - containerPort: 80 http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/brooklyn-server/locations/container/src/test/resources/nginx-service.yaml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/container/src/test/resources/nginx-service.yaml b/brooklyn-server/locations/container/src/test/resources/nginx-service.yaml new file mode 100644 index 0000000..3964283 --- /dev/null +++ b/brooklyn-server/locations/container/src/test/resources/nginx-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: nginx-service + namespace: default +spec: + type: NodePort + ports: + - name: "http" + port: 80 + selector: + app: nginx \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/docker-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/docker-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/docker-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver deleted file mode 100644 index 1698b58..0000000 --- a/docker-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ /dev/null @@ -1 +0,0 @@ -io.cloudsoft.amp.containerservice.dockerlocation.DockerLocationResolver http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/docker-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/docker-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/docker-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index 565453f..0000000 --- a/docker-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"; - xsi:schemaLocation=" - http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd - "> - - - <bean id="dockerLocationResolver" scope="prototype" - class="io.cloudsoft.amp.containerservice.dockerlocation.DockerLocationResolver"/> - <service id="dockerLocationResolverService" ref="dockerLocationResolver" - interface="org.apache.brooklyn.api.location.LocationResolver"/> - -</blueprint> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/kubernetes-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/kubernetes-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver deleted file mode 100644 index 3f113fb..0000000 --- a/kubernetes-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ /dev/null @@ -1 +0,0 @@ -io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationResolver http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/kubernetes-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/kubernetes-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index f3b2de4..0000000 --- a/kubernetes-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"; - xsi:schemaLocation=" - http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd - "> - - <bean id="kubernetesLocationResolver" scope="prototype" - class="io.cloudsoft.amp.containerservice.kubernetes.location.KubernetesLocationResolver"/> - <service id="kubernetesLocationResolverService" ref="kubernetesLocationResolver" - interface="org.apache.brooklyn.api.location.LocationResolver"/> - -</blueprint> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/kubernetes-location/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/test/resources/logback.xml b/kubernetes-location/src/test/resources/logback.xml deleted file mode 100644 index d79ea3e..0000000 --- a/kubernetes-location/src/test/resources/logback.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <property name="logging.basename" scope="context" value="kubernetes-location" /> - <include resource="logback-main.xml" /> -</configuration> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/kubernetes-location/src/test/resources/nginx-replication-controller.yaml ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/test/resources/nginx-replication-controller.yaml b/kubernetes-location/src/test/resources/nginx-replication-controller.yaml deleted file mode 100644 index 6788a05..0000000 --- a/kubernetes-location/src/test/resources/nginx-replication-controller.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: nginx-replication-controller - namespace: default -spec: - replicas: 2 - selector: - app: nginx - template: - metadata: - name: nginx - labels: - app: nginx - spec: - containers: - - name: nginx - image: nginx - ports: - - containerPort: 80 http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/kubernetes-location/src/test/resources/nginx-service.yaml ---------------------------------------------------------------------- diff --git a/kubernetes-location/src/test/resources/nginx-service.yaml b/kubernetes-location/src/test/resources/nginx-service.yaml deleted file mode 100644 index 3964283..0000000 --- a/kubernetes-location/src/test/resources/nginx-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: nginx-service - namespace: default -spec: - type: NodePort - ports: - - name: "http" - port: 80 - selector: - app: nginx \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/openshift-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver ---------------------------------------------------------------------- diff --git a/openshift-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver b/openshift-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver deleted file mode 100644 index 0893e6a..0000000 --- a/openshift-location/src/main/resources/META-INF/services/org.apache.brooklyn.api.location.LocationResolver +++ /dev/null @@ -1 +0,0 @@ -io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationResolver http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/openshift-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --git a/openshift-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/openshift-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index e91122f..0000000 --- a/openshift-location/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"; - xsi:schemaLocation=" - http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd - "> - - <bean id="openshiftLocationResolver" scope="prototype" - class="io.cloudsoft.amp.containerservice.openshift.location.OpenShiftLocationResolver"/> - <service id="openshiftLocationResolverService" ref="openshiftLocationResolver" - interface="org.apache.brooklyn.api.location.LocationResolver"/> - -</blueprint> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e5bf1a84/openshift-location/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openshift-location/src/test/resources/logback.xml b/openshift-location/src/test/resources/logback.xml deleted file mode 100644 index 5b700c4..0000000 --- a/openshift-location/src/test/resources/logback.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration> - <property name="logging.basename" scope="context" value="openshift-location" /> - <include resource="logback-main.xml" /> -</configuration>
