Updated the public AMIs

ConPaaS-team · Feb 3, 2015 · a873f41 · a873f41
1 parent 6b30ab1
commit a873f41
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/conpaas-director/director.cfg.example b/conpaas-director/director.cfg.example
@@ -9,7 +9,7 @@ CERT_DIR = /etc/cpsdirector/certs
 DEPLOYMENT_NAME = conpaas-online
 
 # Support for external identity providers
-support_external_idp = false
+SUPPORT_EXTERNAL_IDP = false
 
 # Uncomment the following directives in case you want to use per-application
 # Virtual Private Networks. In the default config presented below, the maximum
@@ -108,11 +108,11 @@ support_external_idp = false
 #
 # ConPaaS official AMI ids are: 
 #
-# - ami-22cc4b4a United States East (Northern Virginia)
-# - ami-e31d52d3 United States West (Oregon)
-# - ami-5058f627 Europe West (Ireland)
+# - ami-802e6ce8 United States East (Northern Virginia)
+# - ami-dd8bd0ed United States West (Oregon)
+# - ami-f158d686 Europe West (Ireland)
 
-# IMAGE_ID = ami-22cc4b4a
+# IMAGE_ID = ami-802e6ce8
 
 # This variable contains the type of EC2 instances to use. A good value to use
 # inexpensive, low-performance instances is "t1.micro".

diff --git a/conpaas-director/director.cfg.multicloud-example b/conpaas-director/director.cfg.multicloud-example
@@ -41,7 +41,7 @@ PASSWORD = EC2PASSWORD
 SECURITY_GROUP_NAME = my_securitygroup
 KEY_NAME = my_keyname
 REGION = ec2.us-east-1.amazonaws.com
-IMAGE_ID = ami-22cc4b4a
+IMAGE_ID = ami-802e6ce8
 SIZE_ID = t1.micro
 # specify COST_PER_TIME as currency amount / ATU (in seconds)
 # so            $ 6.00 / 3600  is 6 dollar per hour             (or part thereof)

diff --git a/conpaas-services/config/cloud/ec2.cfg.example b/conpaas-services/config/cloud/ec2.cfg.example
@@ -19,7 +19,7 @@ PASSWORD = UTWhOHoqoYYnZ9pbUT2aZMp75RTJmkLimPxz8uTy
 # https://console.aws.amazon.com/ec2/home?region=us-east-1#s=Images 
 # Unless you have a specific reason to do otherwise, you should use 
 # the same value as field "ami" from configuration file aws.ini.
-IMAGE_ID = ami-22cc4b4a
+IMAGE_ID = ami-802e6ce8
 
 # This variable should contain the type of EC2 instances to use. A
 # good value to use inexpensive, low-performance instances is

diff --git a/conpaas-services/scripts/create_vm/nutshell-config/director.cfg b/conpaas-services/scripts/create_vm/nutshell-config/director.cfg
@@ -80,11 +80,11 @@ CERT_DIR = /etc/cpsdirector/certs
 #
 # ConPaaS official AMI ids are: 
 #
-# - ami-e31d52d3 United States West (Oregon)
-# - ami-22cc4b4a United States East (Northern Virginia)
-# - ami-5058f627 Europe West (Ireland)
+# - ami-dd8bd0ed United States West (Oregon)
+# - ami-802e6ce8 United States East (Northern Virginia)
+# - ami-f158d686 Europe West (Ireland)
 
-# IMAGE_ID = ami-e31d52d3
+# IMAGE_ID = ami-dd8bd0ed
 
 # This variable contains the type of EC2 instances to use. A good value to use
 # inexpensive, low-performance instances is "t1.micro".

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -705,11 +705,11 @@ dependencies of its processes. For your convenience we provide a pre-built
 public AMI, already configured and ready to be used on Amazon EC2, for each
 availability zone supported by ConPaaS. The AMI IDs of said images are:
 
--  ``ami-e31d52d3`` United States West (Oregon)
+-  ``ami-dd8bd0ed`` United States West (Oregon)
 
--  ``ami-22cc4b4a`` United States East (Northern Virginia)
+-  ``ami-802e6ce8`` United States East (Northern Virginia)
 
--  ``ami-5058f627`` Europe West (Ireland)
+-  ``ami-f158d686`` Europe West (Ireland)
 
 You can use one of these values when configuring your ConPaaS director
 installation as described in :ref:`director-installation`.