Skip to content

Commit

Permalink
Merge with team/evac
Browse files Browse the repository at this point in the history
  • Loading branch information
vasiliykochergin committed Feb 6, 2013
2 parents f0310dd + 3492653 commit 676bcef
Show file tree
Hide file tree
Showing 202 changed files with 17,297 additions and 2,267 deletions.
20 changes: 10 additions & 10 deletions INSTALL
Expand Up @@ -40,7 +40,7 @@ java-devel java-devel openssl-devel curl-devel axis2c dhcp dhcp-common postgresq
python-boto rampartc iscsi-initiator-utils perl-Crypt-OpenSSL-RSA perl-Crypt-OpenSSL-Random \
sudo which jpackage-utils java lvm2 velocity drbd83 drbd83-kmod drbd-utils drbd euca2ools bitstream-vera-fonts \
dejavu-serif-fonts bridge-utils iptables vtun device-mapper coreutils e2fsprogs file parted util-linux rsync \
PyGreSQL libcurl4 curl apache2 httpd libvirt tgt scsi-target-utils vconfig wget kvm dhcp-server
PyGreSQL libcurl4 curl apache2 httpd libvirt tgt scsi-target-utils vconfig wget kvm dhcp-server iputils

Package-name & availability notes for CentOS 6.2 (and possibly earlier?):

Expand All @@ -51,9 +51,9 @@ Package-name & availability notes for CentOS 6.2 (and possibly earlier?):
- tgt was replaced by scsi-target-utils.
- bitstream-vera-fonts is no longer available.

Download and save the following file https://github.com/eucalyptus/eucalyptus-rpmspec/blob/master/euca-WSDL2C.sh
Download and save the following file https://raw.github.com/eucalyptus/eucalyptus-rpmspec/master/euca-WSDL2C.sh

to /opt/euca-WSDL2C.sh
to /opt/euca-WSDL2C.sh and make it executable

CentOS/RHEL 5
-------------
Expand Down Expand Up @@ -83,11 +83,11 @@ perl-Crypt-OpenSSL-Random sudo which jpackage-utils java lvm2 velocity drbd83
drbd83-kmod drbd-utils drbd euca2ools bitstream-vera-fonts dejavu-serif-fonts
bridge-utils iptables vtun device-mapper coreutils e2fsprogs file parted
util-linux rsync PyGreSQL libcurl4 curl apache2 httpd libvirt tgt scsi-target-utils
vconfig wget xen dhcp-server
vconfig wget xen dhcp-server iputils

Download and save the following file https://github.com/eucalyptus/eucalyptus-rpmspec/blob/master/euca-WSDL2C.sh
Download and save the following file https://raw.github.com/eucalyptus/eucalyptus-rpmspec/master/euca-WSDL2C.sh

to /opt/euca-WSDL2C.sh
to /opt/euca-WSDL2C.sh and make it executable


Ubuntu 12.04 LTS
Expand All @@ -99,7 +99,7 @@ cdbs debhelper libaxis2c-dev librampart-dev \
default-jdk libvirt-dev libfuse-dev libfuse2 libcurl4-openssl-dev \
libssl-dev ant-optional zlib1g-dev pkg-config swig python \
python-setuptools rsync wget open-iscsi libxslt1-dev gengetopt ant \
groovy postgresql-server-dev-9.1
groovy postgresql-server-dev-9.1 iputils-arping

Download axis2-1.4 from http://archive.apache.org/dist/ws/axis2/1_4/axis2-1.4-bin.zip and unzip it in /opt, so /opt/axis2-1.4 exists

Expand All @@ -111,7 +111,7 @@ Walrus: libc6, adduser, openssh-server, openssh-client, sudo, rsync, postgresql-

SC: libc6, adduser, openssh-server, openssh-client, sudo, rsync, postgresql-client-9.1, python, python2.7, python-boto (>= 2.1), python-psutil, tgt, open-iscsi, libcrypt-openssl-random-perl, libcrypt-openssl-rsa-perl, libcrypt-x509-perl, lvm2, vblade

CC: libaxis2c0, libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), librampart0 (>= 1.3.0-1euca2), libssl1.0.0 (>= 1.0.0), adduser, openssh-server, openssh-client, sudo, rsync, python (>= 2.5), python2.7, python-boto (>= 2.1), python-psutil (>= 0.1.2), apache2, libapache2-mod-axis2c, libssl1.0.0 (>= 1.0.0), bridge-utils, vlan, dhcp3-server, iptables, vtun, libpam-modules (>= 1.0.1-9ubuntu3)
CC: libaxis2c0, libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), librampart0 (>= 1.3.0-1euca2), libssl1.0.0 (>= 1.0.0), adduser, openssh-server, openssh-client, sudo, rsync, python (>= 2.5), python2.7, python-boto (>= 2.1), python-psutil (>= 0.1.2), apache2, libapache2-mod-axis2c, libssl1.0.0 (>= 1.0.0), bridge-utils, vlan, dhcp3-server, iptables, vtun, libpam-modules (>= 1.0.1-9ubuntu3), iputils-arping

NC: libaxis2c0, libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), librampart0 (>= 1.3.0-1euca2), libssl1.0.0 (>= 1.0.0), libvirt0 (>= 0.3.0), libxml2 (>= 2.7.4), libxslt1.1 (>= 1.1.25), apache2-mpm-worker | apache2-mpm-prefork, libapache2-mod-axis2c, apache2, libc6 (>= 2.2.5), adduser, openssh-server, openssh-client, sudo, adduser, parted, libvirt-bin, open-iscsi, libcrypt-openssl-random-perl, libcrypt-openssl-rsa-perl, libcrypt-x509-perl, euca2ools (>= 1.4~), libdevmapper, python (>= 2.5), python2.7, python-boto (>= 2.1), python-psutil (>= 0.1.2), file, rsync

Expand All @@ -130,7 +130,7 @@ cdbs debhelper libaxis2c-dev librampart-dev \
default-jdk libvirt-dev libfuse-dev libfuse2 libcurl4-openssl-dev \
libssl-dev ant-optional zlib1g-dev pkg-config swig python \
python-setuptools rsync wget open-iscsi libxslt1-dev gengetopt ant \
groovy postgresql-server-dev-9.1
groovy postgresql-server-dev-9.1 iputils-arping

Install the following runtime dependencies. Dependencies are broken down by Eucalyptus component.

Expand All @@ -140,7 +140,7 @@ Walrus: libc6, adduser, openssh-server, openssh-client, sudo, rsync, postgresql-

SC: libc6, adduser, openssh-server, openssh-client, sudo, rsync, postgresql-client-9.1, python, python2.7, python-boto (>= 2.1), python-psutil, tgt, open-iscsi, libcrypt-openssl-random-perl, libcrypt-openssl-rsa-perl, libcrypt-x509-perl, lvm2, vblade

CC: libaxis2c0, libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), librampart0 (>= 1.3.0-1euca2), libssl1.0.0 (>= 1.0.0), adduser, openssh-server, openssh-client, sudo, rsync, python (>= 2.5), python2.7, python-boto (>= 2.1), python-psutil (>= 0.1.2), apache2, libapache2-mod-axis2c, libssl1.0.0 (>= 1.0.0), bridge-utils, vlan, dhcp3-server, iptables, vtun, libpam-modules (>= 1.0.1-9ubuntu3)
CC: libaxis2c0, libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), librampart0 (>= 1.3.0-1euca2), libssl1.0.0 (>= 1.0.0), adduser, openssh-server, openssh-client, sudo, rsync, python (>= 2.5), python2.7, python-boto (>= 2.1), python-psutil (>= 0.1.2), apache2, libapache2-mod-axis2c, libssl1.0.0 (>= 1.0.0), bridge-utils, vlan, dhcp3-server, iptables, vtun, libpam-modules (>= 1.0.1-9ubuntu3), iputils-arping

NC: libaxis2c0, libc6 (>= 2.14), libcurl3 (>= 7.16.2-1), librampart0 (>= 1.3.0-1euca2), libssl1.0.0 (>= 1.0.0), libvirt0 (>= 0.3.0), libxml2 (>= 2.7.4), libxslt1.1 (>= 1.1.25), apache2-mpm-worker | apache2-mpm-prefork, libapache2-mod-axis2c, apache2, libc6 (>= 2.2.5), adduser, openssh-server, openssh-client, sudo, adduser, parted, libvirt-bin, open-iscsi, libcrypt-openssl-random-perl, libcrypt-openssl-rsa-perl, libcrypt-x509-perl, euca2ools (>= 1.4~), libdevmapper, python (>= 2.5), python2.7, python-boto (>= 2.1), python-psutil (>= 0.1.2), file, rsync

Expand Down
2 changes: 1 addition & 1 deletion clc/eucadmin/bin/euca-evacuate-node
Expand Up @@ -25,7 +25,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

import eucadmin.describenodes
import eucadmin.evacuatenode

if __name__ == "__main__":
r = eucadmin.evacuatenode.EvacuateNode()
Expand Down
Expand Up @@ -65,6 +65,7 @@
import java.security.cert.X509Certificate;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;

import org.apache.log4j.Logger;
import org.hibernate.criterion.Restrictions;
Expand All @@ -84,7 +85,9 @@
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.util.X509CertHelper;
import com.eucalyptus.entities.EntityWrapper;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;

/**
* The authorization provider based on database storage. This class includes all the APIs to
Expand Down Expand Up @@ -294,8 +297,25 @@ public void deleteAccount( String accountName, boolean forceDeleteSystem, boolea
Debugging.logError( LOG, e, "Failed to delete account " + accountName );
throw new AuthException( AuthException.NO_SUCH_ACCOUNT, e );
}
}

}

@Override
public Set<String> resolveAccountNumbersForName( final String accountNameLike ) throws AuthException {
final Set<String> results = Sets.newHashSet( );
final EntityWrapper<AccountEntity> db = EntityWrapper.get( AccountEntity.class );
try {
for ( final AccountEntity account : db.query( new AccountEntity( accountNameLike ) ) ) {
results.add( account.getAccountNumber() );
}
} catch ( Exception e ) {
Debugging.logError( LOG, e, "Failed to resolve account numbers" );
throw new AuthException( "Failed to resolve account numbers", e );
} finally {
db.rollback();
}
return results;
}

@Override
public List<User> listAllUsers( ) throws AuthException {
List<User> results = Lists.newArrayList( );
Expand Down
28 changes: 28 additions & 0 deletions clc/modules/autoscaling-common/build.xml
@@ -0,0 +1,28 @@
<!--
Copyright 2009-2013 Eucalyptus Systems, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 3 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
additional information or have any questions.
-->

<project name="eucalyptus-autoscaling-common" basedir=".">
<property name="builder.suffix" value="groovy" />
<uptodate property="groovyc.notRequired" targetfile="${jar.file}">
<srcfiles dir="${src.dir}" includes="**/*" />
</uptodate>
<import file="../module-inc.xml"/>
</project>

@@ -0,0 +1,40 @@
/*************************************************************************
* Copyright 2009-2013 Eucalyptus Systems, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*
* Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
* CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
* additional information or have any questions.
************************************************************************/
package com.eucalyptus.autoscaling.common;

import com.eucalyptus.auth.policy.PolicySpec;
import com.eucalyptus.component.ComponentId;
import com.eucalyptus.component.id.Eucalyptus;

/**
* @author Chris Grzegorczyk <grze@eucalyptus.com>
*/
@ComponentId.Partition( Eucalyptus.class )
@ComponentId.PublicService
@ComponentId.PolicyVendor( PolicySpec.VENDOR_AUTOSCALING )
@ComponentId.FaultLogPrefix( "cloud" )
public class AutoScaling extends ComponentId {
private static final long serialVersionUID = 1L;

@Override
public String getInternalNamespaceSuffix() {
return "/autoscaling";
}
}

0 comments on commit 676bcef

Please sign in to comment.