You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/08 11:45:26 UTC
[05/50] [abbrv] git commit: updated refs/heads/feature/vpc-ipv6 to
6140db5
Cleanup awsapi leftovers
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #328
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1958a8e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1958a8e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1958a8e9
Branch: refs/heads/feature/vpc-ipv6
Commit: 1958a8e9c1edcfd4522ff4ee91e236a510d6c7bc
Parents: ab3b3c7
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri May 29 13:02:55 2015 -0400
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri May 29 19:15:51 2015 +0200
----------------------------------------------------------------------
client/tomcatconf/server7-ssl.xml.in | 106 ----------------------------
debian/rules | 1 -
packaging/centos63/cloud.spec | 4 --
packaging/centos7/cloud.spec | 4 --
packaging/fedora20/cloud.spec | 4 --
packaging/fedora21/cloud.spec | 4 --
python/lib/cloudutils/serviceConfig.py | 2 +-
tools/devcloud/src/Vagrantfile | 1 -
8 files changed, 1 insertion(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/client/tomcatconf/server7-ssl.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/server7-ssl.xml.in b/client/tomcatconf/server7-ssl.xml.in
index 2c30651..2633bca 100755
--- a/client/tomcatconf/server7-ssl.xml.in
+++ b/client/tomcatconf/server7-ssl.xml.in
@@ -154,110 +154,4 @@
</Host>
</Engine>
</Service>
-
- <Service name="Catalina7080">
-
- <!--The connectors can use a shared executor, you can define one or more named thread pools-->
- <Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
- maxThreads="150" minSpareThreads="25"/>
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Documentation at :
- Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
- Java AJP Connector: /docs/config/ajp.html
- APR (HTTP/AJP) Connector: /docs/apr.html
- Define a non-SSL HTTP/1.1 Connector on port 8080
- -->
- <!--
- <Connector port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
- redirectPort="8443" />
- -->
- <!-- A "Connector" using the shared thread pool-->
- <!--
- <Connector executor="tomcatThreadPool"
- port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
- connectionTimeout="20000" disableUploadTimeout="true"
- acceptCount="150" enableLookups="false" maxThreads="150"
- maxHttpHeaderSize="8192" redirectPort="8443" />
- -->
- <!-- Define a SSL HTTP/1.1 Connector on port 8443
- This connector uses the JSSE configuration, when using APR, the
- connector should be using the OpenSSL style configuration
- described in the APR documentation -->
- <!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
- keystoreType="PKCS12"
- keystoreFile="conf/cloud-localhost.pk12"
- keystorePass="password"
- />
- -->
-
- <!-- Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 -->
- <Connector executor="tomcatThreadPool-internal" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
- maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS"
- keystoreType="JKS"
- keystoreFile="/etc/cloudstack/management/cloudmanagementserver.keystore"
- keystorePass="vmops.com"/>
-
- <!-- Define an AJP 1.3 Connector on port 20400 -->
- <Connector port="20400" protocol="AJP/1.3" redirectPort="6443" />
-
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host).
- Documentation at /docs/config/engine.html -->
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
- -->
- <Engine name="Catalina7080" defaultHost="localhost">
-
- <!--For clustering, please take a look at documentation at:
- /docs/cluster-howto.html (simple how to)
- /docs/config/cluster.html (reference documentation) -->
- <!--
- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
- -->
-
- <!-- The request dumper valve dumps useful debugging information about
- the request and response data received and sent by Tomcat.
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
- <Host name="localhost" appBase="webapps7080"
- unpackWARs="true" autoDeploy="true"
- xmlValidation="false" xmlNamespaceAware="false">
-
- <!-- SingleSignOn valve, share authentication between web applications
- Documentation at: /docs/config/valve.html -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
- -->
-
- <!-- Access log processes all example.
- Documentation at: /docs/config/valve.html -->
- <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
- prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
-
- </Host>
- </Engine>
- </Service>
</Server>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 66a3623..888cf5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,6 @@ override_dh_auto_install:
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client
- mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
mkdir $(DESTDIR)/var/log/$(PACKAGE)/management
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index afa29b8..4154560 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -397,10 +397,6 @@ if [ "$1" == "1" ] ; then
/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
fi
-if [ -d "%{_datadir}/%{name}-management" ] ; then
- ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
-fi
-
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 71034fc..d9ed26e 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -362,10 +362,6 @@ if [ "$1" == "1" ] ; then
/usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
fi
-if [ -d "%{_datadir}/%{name}-management" ] ; then
- ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
-fi
-
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/packaging/fedora20/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/fedora20/cloud.spec b/packaging/fedora20/cloud.spec
index f6aa109..26251ee 100644
--- a/packaging/fedora20/cloud.spec
+++ b/packaging/fedora20/cloud.spec
@@ -398,10 +398,6 @@ if [ "$1" == "1" ] ; then
/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
fi
-if [ -d "%{_datadir}/%{name}-management" ] ; then
- ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
-fi
-
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/packaging/fedora21/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/fedora21/cloud.spec b/packaging/fedora21/cloud.spec
index 71f7a9d..cad17ed 100644
--- a/packaging/fedora21/cloud.spec
+++ b/packaging/fedora21/cloud.spec
@@ -398,10 +398,6 @@ if [ "$1" == "1" ] ; then
/sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true
fi
-if [ -d "%{_datadir}/%{name}-management" ] ; then
- ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
-fi
-
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/python/lib/cloudutils/serviceConfig.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index 86f5a90..03891ea 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -746,7 +746,7 @@ class firewallConfigServer(firewallConfigBase):
if self.syscfg.env.svrMode == "myCloud":
self.ports = "443 8080 8250 8443 9090".split()
else:
- self.ports = "8080 7080 8250 9090".split()
+ self.ports = "8080 8250 9090".split()
class ubuntuFirewallConfigServer(firewallConfigServer):
def allowPort(self, port):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1958a8e9/tools/devcloud/src/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/devcloud/src/Vagrantfile b/tools/devcloud/src/Vagrantfile
index 3f0d904..46bae93 100644
--- a/tools/devcloud/src/Vagrantfile
+++ b/tools/devcloud/src/Vagrantfile
@@ -40,7 +40,6 @@ Vagrant::Config.run do |config|
config.vm.forward_port 8787, 8787
config.vm.forward_port 8250, 8250
config.vm.forward_port 8096, 8096
- config.vm.forward_port 7080, 7080
# Ensure the VM has the right virtual resources
#config.vm.
config.vm.customize ["modifyvm", :id, "--memory", 2048]