Build & deployment improvements

Move cluster/proxy management operations to the platform

Cartridges no longer need to publish NET_TCP:httpd-proxy-info or
NET_TCP:gear-endpoint-info as the platform now calls the web proxy
cartridge's new 'update-cluster' control method.

Author: ncdc

cartridges/openshift-origin-cartridge-diy/metadata/manifest.yml

@@ -59,10 +59,6 @@ Provides:
 - diy-0.1
 - diy
 Publishes:
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
 Subscribes:
   set-env:
     Type: ENV:*

cartridges/openshift-origin-cartridge-haproxy/bin/control

@@ -211,6 +211,11 @@ function enable-server() {
     done
 }
 
+function update-cluster() {
+    shift
+    ${OPENSHIFT_HAPROXY_DIR}/usr/bin/update-cluster "$@"
+}
+
 #
 # main():
 #
@@ -232,4 +237,5 @@ case "$1" in
     status)         status              ;;
     disable-server) disable-server "$@" ;;
     enable-server)  enable-server  "$@" ;;
+    update-cluster) update-cluster "$@" ;;
 esac

cartridges/openshift-origin-cartridge-haproxy/bin/install

@@ -29,12 +29,6 @@ Components:
       publish-haproxy-status-url:
         Type: NET_TCP:haproxy-status-info
     Subscribes:
-      set-proxy:
-        Type: NET_TCP:httpd-proxy-info
-        Required: false
-      set-gear-endpoints:
-        Type: NET_TCP:gear-endpoint-info
-        Required: false
       set-db-connection-info:
         Type: NET_TCP:db:connection-info
         Required: false

cartridges/openshift-origin-cartridge-haproxy/hooks/set-gear-endpoints

@@ -26,7 +26,7 @@ do
 done
 
 
-[ $# -gt 3 ] || print_help
+#[ $# -gt 3 ] || print_help
 
 exitcode=0
 
@@ -37,9 +37,8 @@ haproxy_cfg=$OPENSHIFT_HAPROXY_DIR/conf/haproxy.cfg
 # Establish locking file descriptor
 exec 200>${haproxy_cfg}.lock
 
-# Remove the first 3 args and process all the remaining args of the form k=v.
 # The values are the gear endpoints.
-kvargs=$(echo "${@:4}" | tr -d "\n" )
+kvargs=$@
 for arg in $kvargs; do
     zinfo=$(echo "$arg" | cut -f 2 -d '=' | tr -d "'")
     zarr=(${zinfo//|/ })

cartridges/openshift-origin-cartridge-haproxy/metadata/manifest.yml

@@ -60,10 +60,6 @@ Provides:
 - jbossas-standalone
 - jboss-as7-standalone
 Publishes:
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
   publish-jboss-cluster:
     Type: NET_TCP:jbossas-cluster-info
   publish-jboss-remoting:

cartridges/openshift-origin-cartridge-haproxy/hooks/set-proxy cartridges/openshift-origin-cartridge-haproxy/usr/bin/update-cluster

@@ -61,10 +61,6 @@ Provides:
 - jbosseap-standalone
 - jboss-eap6-standalone
 Publishes:
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
   publish-jboss-cluster:
     Type: NET_TCP:jbosseap-cluster-info
   publish-jboss-remoting:

cartridges/openshift-origin-cartridge-jbossas/hooks/publish-http-url

@@ -72,10 +72,6 @@ Provides:
 Publishes:
   get-internal-uri:
     Type: NET_TCP:http
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
 Subscribes:
   set-env:
     Type: ENV:*

cartridges/openshift-origin-cartridge-jbossas/metadata/manifest.yml

@@ -69,7 +69,6 @@ alternatives --set jbossews-2.0 /usr/share/tomcat7
 %files
 %dir %{cartridgedir}
 %attr(0755,-,-) %{cartridgedir}/bin/
-%attr(0755,-,-) %{cartridgedir}/hooks/
 %{cartridgedir}
 %doc %{cartridgedir}/README.md
 %doc %{cartridgedir}/COPYRIGHT

cartridges/openshift-origin-cartridge-jbosseap/hooks/publish-http-url

@@ -24,10 +24,6 @@ Cart-Data:
   Type: environment
   Description: An example environment variable using ERB processing
 Publishes:
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
 Subscribes:
   set-env:
     Type: ENV:*

cartridges/openshift-origin-cartridge-jbosseap/metadata/manifest.yml

@@ -31,7 +31,6 @@ test platform functionality. (Cartridge Format V2)
 %files
 %dir %{cartridgedir}
 %attr(0755,-,-) %{cartridgedir}/bin/
-%attr(0755,-,-) %{cartridgedir}/hooks/
 %{cartridgedir}
 %doc %{cartridgedir}/README.md
 %doc %{cartridgedir}/COPYRIGHT

cartridges/openshift-origin-cartridge-jbossews/hooks/publish-http-url

@@ -63,10 +63,6 @@ Scaling:
 Publishes:
   get-doc-root:
     Type: FILESYSTEM:doc-root
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
 Subscribes:
   set-env:
     Type: ENV:*

cartridges/openshift-origin-cartridge-jbossews/metadata/manifest.yml

@@ -66,10 +66,6 @@ Scaling:
 Publishes:
   get-doc-root:
     Type: FILESYSTEM:doc-root
-  publish-http-url:
-    Type: NET_TCP:httpd-proxy-info
-  publish-gear-endpoint:
-    Type: NET_TCP:gear-endpoint-info
 Subscribes:
   set-env:
     Type: ENV:*

cartridges/openshift-origin-cartridge-jbossews/openshift-origin-cartridge-jbossews.spec

@@ -79,7 +79,6 @@ Provides Node.js support to OpenShift. (Cartridge Format V2)
 %files
 %dir %{cartridgedir}
 %attr(0755,-,-) %{cartridgedir}/bin/
-%attr(0755,-,-) %{cartridgedir}/hooks/
 %{cartridgedir}
 %doc %{cartridgedir}/README.md
 %doc %{cartridgedir}/COPYRIGHT