Permalink
Browse files

Update and separate config files

Fixes TOOLS-454
  • Loading branch information...
1 parent ba4a27d commit 125919e1857d45413d2fef0c4cca9f1c8282bc64 @gholms gholms committed May 5, 2014
Showing with 163 additions and 149 deletions.
  1. +135 −0 conf/conf.d/aws.ini
  2. +12 −0 conf/conf.d/ecc.ini
  3. +12 −0 conf/conf.d/localhost.ini
  4. +4 −149 conf/euca2ools.ini
View
@@ -0,0 +1,135 @@
+; Amazon Web Services
+; http://docs.aws.amazon.com/general/latest/gr/rande.html
+
+[region aws:*]
+iam-url = use aws:us-east-1
+sts-url = use aws:us-east-1
+
+certificate = /usr/share/euca2ools/certs/cert-ec2.pem
+verify-ssl = true
+
+
+[region aws:us-east-1]
+; Northern Virginia, USA
+autoscaling-url = https://autoscaling.us-east-1.amazonaws.com/
+cloudformation-url = https://cloudformation.us-east-1.amazonaws.com/
+ec2-url = https://ec2.us-east-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.us-east-1.amazonaws.com/
+iam-url = https://iam.amazonaws.com/
+monitoring-url = https://monitoring.us-east-1.amazonaws.com/
+s3-url = https://s3.amazonaws.com/
+sts-url = https://sts.amazonaws.com/
+
+
+[region aws:us-west-1]
+; Northern California, USA
+autoscaling-url = https://autoscaling.us-west-1.amazonaws.com/
+cloudformation-url = https://cloudformation.us-west-1.amazonaws.com/
+ec2-url = https://ec2.us-west-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.us-west-1.amazonaws.com/
+monitoring-url = https://monitoring.us-west-1.amazonaws.com/
+s3-url = https://s3-us-west-1.amazonaws.com/
+
+s3-location-constraint = us-west-1
+
+
+[region aws:us-west-2]
+; Oregon, USA
+autoscaling-url = https://autoscaling.us-west-2.amazonaws.com/
+cloudformation-url = https://cloudformation.us-west-2.amazonaws.com/
+ec2-url = https://ec2.us-west-2.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.us-west-2.amazonaws.com/
+monitoring-url = https://monitoring.us-west-2.amazonaws.com/
+s3-url = https://s3-us-west-2.amazonaws.com/
+
+s3-location-constraint = us-west-2
+
+
+[region aws:eu-west-1]
+; Ireland
+autoscaling-url = https://autoscaling.eu-west-1.amazonaws.com/
+cloudformation-url = https://cloudformation.eu-west-1.amazonaws.com/
+ec2-url = https://ec2.eu-west-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.eu-west-1.amazonaws.com/
+monitoring-url = https://monitoring.eu-west-1.amazonaws.com/
+s3-url = https://s3-eu-west-1.amazonaws.com/
+
+s3-location-constraint = EU
+
+
+[region aws:ap-southeast-1]
+; Singapore
+autoscaling-url = https://autoscaling.ap-southeast-1.amazonaws.com/
+cloudformation-url = https://cloudformation.ap-southeast-1.amazonaws.com/
+ec2-url = https://ec2.ap-southeast-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.ap-southeast-1.amazonaws.com/
+monitoring-url = https://monitoring.ap-southeast-1.amazonaws.com/
+s3-url = https://s3-ap-southeast-1.amazonaws.com/
+
+s3-location-constraint = ap-southeast-1
+
+
+[region aws:ap-southeast-2]
+; Sydney, Australia
+autoscaling-url = https://autoscaling.ap-southeast-2.amazonaws.com/
+cloudformation-url = https://cloudformation.ap-southeast-2.amazonaws.com/
+ec2-url = https://ec2.ap-southeast-2.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.ap-southeast-2.amazonaws.com/
+monitoring-url = https://monitoring.ap-southeast-2.amazonaws.com/
+s3-url = https://s3-ap-southeast-2.amazonaws.com/
+
+s3-location-constraint = ap-southeast-2
+
+
+[region aws:ap-northeast-1]
+; Tokyo, Japan
+autoscaling-url = https://autoscaling.ap-northeast-1.amazonaws.com/
+cloudformation-url = https://cloudformation.ap-northeast-1.amazonaws.com/
+ec2-url = https://ec2.ap-northeast-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.ap-northeast-1.amazonaws.com/
+monitoring-url = https://monitoring.ap-northeast-1.amazonaws.com/
+s3-url = https://s3-ap-northeast-1.amazonaws.com/
+
+s3-location-constraint = ap-northeast-1
+
+
+[region aws:sa-east-1]
+; São Paulo, Brazil
+autoscaling-url = https://autoscaling.sa-east-1.amazonaws.com/
+cloudformation-url = https://cloudformation.sa-east-1.amazonaws.com/
+ec2-url = https://ec2.sa-east-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.sa-east-1.amazonaws.com/
+monitoring-url = https://monitoring.sa-east-1.amazonaws.com/
+s3-url = https://s3-sa-east-1.amazonaws.com/
+
+s3-location-constraint = sa-east-1
+
+
+[region aws:us-gov-west-1]
+; GovCloud
+autoscaling-url = https://autoscaling.us-gov-west-1.amazonaws.com/
+cloudformation-url = https://cloudformation.us-gov-west-1.amazonaws.com/
+ec2-url = https://ec2.us-gov-west-1.amazonaws.com/
+elasticloadbalancing-url = https://elasticloadbalancing.us-gov-west-1.amazonaws.com/
+iam-url = https://iam.us-gov.amazonaws.com/
+monitoring-url = https://monitoring.us-gov-west-1.amazonaws.com/
+s3-url = https://s3-us-gov-west-1.amazonaws.com/
+sts-url = https://sts.us-gov-west-1.amazonaws.com/
+
+certificate = /usr/share/euca2ools/certs/cert-ec2-gov.pem
+s3-location-constraint = us-gov-west-1
+
+
+[region aws:cn-north-1]
+; Beijing, China
+autoscaling-url = https://autoscaling.cn-north-1.amazonaws.com.cn/
+cloudformation-url = https://cloudformation.cn-north-1.amazonaws.com.cn/
+ec2-url = https://ec2.cn-north-1.amazonaws.com.cn/
+elasticloadbalancing-url = https://elasticloadbalancing.cn-north-1.amazonaws.com.cn/
+iam-url = https://iam.cn-north-1.amazonaws.com.cn/
+monitoring-url = https://monitoring.cn-north-1.amazonaws.com.cn/
+s3-url = https://s3.cn-north-1.amazonaws.com.cn/
+sts-url = https://sts.cn-north-1.amazonaws.com.cn/
+
+certificate = /usr/share/euca2ools/certs/cert-ec2-cn-north-1.pem
+s3-location-constraint = cn-north-1
View
@@ -0,0 +1,12 @@
+; Eucalyptus Community Cloud
+
+[region ecc]
+autoscaling-url = https://autoscaling.communitycloud.eucalyptus.com:8773/
+ec2-url = https://compute.communitycloud.eucalyptus.com:8773/
+elasticloadbalancing-url = https://loadbalancing.communitycloud.eucalyptus.com:8773/
+iam-url = https://euare.communitycloud.eucalyptus.com:8773/
+monitoring-url = https://cloudwatch.communitycloud.eucalyptus.com:8773/
+s3-url = https://objectstorage.communitycloud.eucalyptus.com:8773/
+sts-url = https://tokens.communitycloud.eucalyptus.com:8773/
+
+certificate = /usr/share/euca2ools/certs/cert-ecc.pem
View
@@ -0,0 +1,12 @@
+; Eucalyptus (all user services on localhost)
+
+[region localhost]
+autoscaling-url = http://127.0.0.1:8773/services/AutoScaling/
+ec2-url = http://127.0.0.1:8773/services/compute/
+elasticloadbalancing-url = http://127.0.0.1:8773/services/LoadBalancing/
+iam-url = http://127.0.0.1:8773/services/Euare/
+monitoring-url = http://127.0.0.1:8773/services/CloudWatch/
+s3-url = http://127.0.0.1:8773/services/objectstorage/
+sts-url = http://127.0.0.1:8773/services/Tokens/
+
+certificate = /var/lib/eucalyptus/keys/cloud-cert.pem
View
@@ -1,15 +1,13 @@
; Main euca2ools configuration file
;
-; Euca2ools get their configuration from the following sources, on order of
-; lowest to highest priority:
+; Euca2ools commands get their configuration from the following sources:
; - /etc/euca2ools/euca2ools.ini (this file)
; - /etc/euca2ools/conf.d/*.ini
; - ~/.euca/*.ini
;
-; The settings in this file alone are not enough to use a cloud -- you will
-; also need to obtain credentials from your cloud of choice and supply them
-; either at the command line or in a section like the following in a
-; configuration file:
+; The list of URLs for your cloud of choice is not enough to use it --
+; you will also need to obtain credentials from it and supply them at
+; the command line or in a section like the following:
;
; [user example]
; key-id = AKIAIOSF0DNN7EXAMPLE
@@ -20,146 +18,3 @@
;
; [region localhost]
; user = example
-
-
-[region localhost]
-; Eucalyptus (all services on localhost)
-autoscaling-url = http://127.0.0.1:8773/services/AutoScaling/
-ec2-url = http://127.0.0.1:8773/services/Eucalyptus/
-elasticloadbalancing-url = http://127.0.0.1:8773/services/LoadBalancing/
-iam-url = http://127.0.0.1:8773/services/Euare/
-monitoring-url = http://127.0.0.1:8773/services/CloudWatch/
-s3-url = http://127.0.0.1:8773/services/Walrus/
-sts-url = http://127.0.0.1:8773/services/Tokens/
-
-; Eucalyptus-specific services, most of which are cloud admin-only
-configuration-url = http://127.0.0.1:8773/services/Configuration/
-empyrean-url = http://127.0.0.1:8773/services/Empyrean/
-properties-url = http://127.0.0.1:8773/services/Properties/
-reporting-url = http://127.0.0.1:8773/services/Reporting/
-
-certificate = /var/lib/eucalyptus/keys/cloud-cert.pem
-
-
-[region ecc]
-; Eucalyptus Community Cloud
-autoscaling-url = https://communitycloud.eucalyptus.com:8773/services/AutoScaling/
-ec2-url = https://communitycloud.eucalyptus.com:8773/services/Eucalyptus/
-elasticloadbalancing-url = https://communitycloud.eucalyptus.com:8773/services/LoadBalancing/
-iam-url = https://communitycloud.eucalyptus.com:8773/services/Euare/
-monitoring-url = https://communitycloud.eucalyptus.com:8773/services/CloudWatch/
-s3-url = https://communitycloud.eucalyptus.com:8773/services/Walrus/
-sts-url = https://communitycloud.eucalyptus.com:8773/services/Tokens/
-
-certificate = /usr/share/euca2ools/certs/cert-ecc.pem
-
-
-[region aws:*]
-; AWS (shared by all regions)
-iam-url = use aws:us-east-1
-sts-url = use aws:us-east-1
-
-certificate = /usr/share/euca2ools/certs/cert-ec2.pem
-verify-ssl = true
-
-
-[region aws:us-east-1]
-; AWS (Northern Virginia, USA)
-autoscaling-url = https://autoscaling.us-east-1.amazonaws.com/
-ec2-url = https://ec2.us-east-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.us-east-1.amazonaws.com/
-iam-url = https://iam.amazonaws.com/
-monitoring-url = https://monitoring.us-east-1.amazonaws.com/
-s3-url = https://s3.amazonaws.com/
-sts-url = https://sts.amazonaws.com/
-
-
-[region aws:us-west-1]
-; AWS (Northern California, USA)
-autoscaling-url = https://autoscaling.us-west-1.amazonaws.com/
-ec2-url = https://ec2.us-west-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.us-west-1.amazonaws.com/
-monitoring-url = https://monitoring.us-west-1.amazonaws.com/
-s3-url = https://s3-us-west-1.amazonaws.com/
-
-s3-location-constraint = us-west-1
-
-
-[region aws:us-west-2]
-; AWS (Oregon, USA)
-autoscaling-url = https://autoscaling.us-west-2.amazonaws.com/
-ec2-url = https://ec2.us-west-2.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.us-west-2.amazonaws.com/
-monitoring-url = https://monitoring.us-west-2.amazonaws.com/
-s3-url = https://s3-us-west-2.amazonaws.com/
-
-s3-location-constraint = us-west-2
-
-
-[region aws:eu-west-1]
-; AWS (Ireland)
-autoscaling-url = https://autoscaling.eu-west-1.amazonaws.com/
-ec2-url = https://ec2.eu-west-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.eu-west-1.amazonaws.com/
-monitoring-url = https://monitoring.eu-west-1.amazonaws.com/
-s3-url = https://s3-eu-west-1.amazonaws.com/
-
-s3-location-constraint = EU
-
-
-[region aws:ap-southeast-1]
-; AWS (Singapore)
-autoscaling-url = https://autoscaling.ap-southeast-1.amazonaws.com/
-ec2-url = https://ec2.ap-southeast-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.ap-southeast-1.amazonaws.com/
-monitoring-url = https://monitoring.ap-southeast-1.amazonaws.com/
-s3-url = https://s3-ap-southeast-1.amazonaws.com/
-
-s3-location-constraint = ap-southeast-1
-
-
-[region aws:ap-southeast-2]
-; AWS (Sydney, Australia)
-autoscaling-url = https://autoscaling.ap-southeast-2.amazonaws.com/
-ec2-url = https://ec2.ap-southeast-2.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.ap-southeast-2.amazonaws.com/
-monitoring-url = https://monitoring.ap-southeast-2.amazonaws.com/
-s3-url = https://s3-ap-southeast-2.amazonaws.com/
-
-s3-location-constraint = ap-southeast-2
-
-
-[region aws:ap-northeast-1]
-; AWS (Tokyo, Japan)
-autoscaling-url = https://autoscaling.ap-northeast-1.amazonaws.com/
-ec2-url = https://ec2.ap-northeast-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.ap-northeast-1.amazonaws.com/
-monitoring-url = https://monitoring.ap-northeast-1.amazonaws.com/
-s3-url = https://s3-ap-northeast-1.amazonaws.com/
-
-s3-location-constraint = ap-northeast-1
-
-
-[region aws:sa-east-1]
-; AWS (São Paulo, Brazil)
-autoscaling-url = https://autoscaling.sa-east-1.amazonaws.com/
-ec2-url = https://ec2.sa-east-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.sa-east-1.amazonaws.com/
-monitoring-url = https://monitoring.sa-east-1.amazonaws.com/
-s3-url = https://s3-sa-east-1.amazonaws.com/
-
-s3-location-constraint = sa-east-1
-
-
-[region aws:us-gov-west-1]
-; AWS (GovCloud)
-autoscaling-url = https://autoscaling.us-gov-west-1.amazonaws.com/
-ec2-url = https://ec2.us-gov-west-1.amazonaws.com/
-elasticloadbalancing-url = https://elasticloadbalancing.us-gov-west-1.amazonaws.com/
-iam-url = https://iam.us-gov.amazonaws.com/
-monitoring-url = https://monitoring.us-gov-west-1.amazonaws.com/
-s3-url = https://s3-us-gov-west-1.amazonaws.com/
-sts-url = https://sts.us-gov-west-1.amazonaws.com/
-
-certificate = /usr/share/euca2ools/certs/cert-ec2-gov.pem
-s3-location-constraint = us-gov-west-1

0 comments on commit 125919e

Please sign in to comment.