Bug 966255: Remove OPENSHIFT_INTERNAL_* references from v2 carts

openshift · May 22, 2013 · 23009cf · 23009cf
1 parent 92394ba
commit 23009cf
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 28 deletions.
diff --git a/cartridges/openshift-origin-cartridge-diy/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-diy/metadata/manifest.yml
@@ -24,10 +24,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environemnt
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_DIY_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_DIY_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-jbossas/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-jbossas/metadata/manifest.yml
@@ -27,10 +27,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_JBOSSAS_HTTP_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_JBOSSAS_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/...ges/openshift-origin-cartridge-jbossas/versions/7/standalone/configuration/standalone.xml b/...ges/openshift-origin-cartridge-jbossas/versions/7/standalone/configuration/standalone.xml
@@ -243,7 +243,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxr:1.0">
             <connection-factory jndi-name="java:jboss/jaxr/ConnectionFactory"/>
-            <juddi-server publish-url="http://${env.OPENSHIFT_INTERNAL_IP}:8080/juddi/publish" query-url="http://${env.OPENSHIFT_INTERNAL_IP}:8080/juddi/query"/>
+            <juddi-server publish-url="http://${env.OPENSHIFT_JBOSSAS_IP}:8080/juddi/publish" query-url="http://${env.OPENSHIFT_JBOSSAS_IP}:8080/juddi/query"/>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
         <subsystem xmlns="urn:jboss:domain:jca:1.1">
@@ -271,7 +271,7 @@
                 	<property name="external_addr">${env.OPENSHIFT_GEAR_DNS}</property>
                     <property name="external_port">${env.OPENSHIFT_JBOSSAS_CLUSTER_PROXY_PORT}</property>
                     <property name="bind_port">7600</property>
-                    <property name="bind_addr">${env.OPENSHIFT_INTERNAL_IP}</property>
+                    <property name="bind_addr">${env.OPENSHIFT_JBOSSAS_IP}</property>
                     <property name="defer_client_bind_addr">true</property>
                 </transport>
                 <protocol type="TCPPING">
@@ -513,15 +513,15 @@
 
     <interfaces>
         <interface name="management">
-            <loopback-address value="${env.OPENSHIFT_INTERNAL_IP}"/>
+            <loopback-address value="${env.OPENSHIFT_JBOSSAS_IP}"/>
         </interface>
         <interface name="public">
-            <loopback-address value="${env.OPENSHIFT_INTERNAL_IP}"/>
+            <loopback-address value="${env.OPENSHIFT_JBOSSAS_IP}"/>
         </interface>
         <interface name="unsecure">
             <!-- Used for IIOP sockets in the standarad configuration.
                  To secure JacORB you need to setup SSL -->
-            <loopback-address value="${env.OPENSHIFT_INTERNAL_IP}"/>
+            <loopback-address value="${env.OPENSHIFT_JBOSSAS_IP}"/>
         </interface>
     </interfaces>
 

diff --git a/cartridges/openshift-origin-cartridge-jbosseap/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-jbosseap/metadata/manifest.yml
@@ -27,10 +27,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_JBOSSEAP_HTTP_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_JBOSSEAP_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-jbossews/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-jbossews/metadata/manifest.yml
@@ -29,10 +29,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_JBOSSEWS_HTTP_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_JBOSSEWS_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-jbossews/versions/1.0/configuration/server.xml b/cartridges/openshift-origin-cartridge-jbossews/versions/1.0/configuration/server.xml
@@ -85,7 +85,7 @@
     <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
                clientAuth="false" sslProtocol="TLS" 
-               address="${env.OPENSHIFT_INTERNAL_IP}"/>
+               address="${env.OPENSHIFT_JBOSSEWS_IP}"/>
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->

diff --git a/cartridges/openshift-origin-cartridge-jenkins/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-jenkins/metadata/manifest.yml
@@ -22,10 +22,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_JENKINS_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_JENKINS_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-nodejs/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-nodejs/metadata/manifest.yml
@@ -26,10 +26,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_NODEJS_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_NODEJS_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-perl/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-perl/metadata/manifest.yml
@@ -22,10 +22,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_PERL_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_PERL_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-php/metadata/manifest.yml.fedora b/cartridges/openshift-origin-cartridge-php/metadata/manifest.yml.fedora
@@ -22,10 +22,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_PHP_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_PHP_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-php/metadata/manifest.yml.rhel b/cartridges/openshift-origin-cartridge-php/metadata/manifest.yml.rhel
@@ -22,10 +22,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_PHP_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_PHP_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-python/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-python/metadata/manifest.yml
@@ -23,10 +23,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_PYTHON_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_PYTHON_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS

diff --git a/cartridges/openshift-origin-cartridge-ruby/metadata/manifest.yml b/cartridges/openshift-origin-cartridge-ruby/metadata/manifest.yml
@@ -23,10 +23,10 @@ Cart-Data:
   - Key: OPENSHIFT_REPO_DIR
     Type: environment
     Description: "Application root directory where application files reside. This directory is reset every time you do a git-push"
-  - Key: OPENSHIFT_INTERNAL_PORT
+  - Key: OPENSHIFT_RUBY_PORT
     Type: environment
     Description: "Internal port to which the web-framework binds to."
-  - Key: OPENSHIFT_INTERNAL_IP
+  - Key: OPENSHIFT_RUBY_IP
     Type: environment
     Description: "Internal IP to which the web-framework binds to."
   - Key: OPENSHIFT_APP_DNS