From b6acc7e09065cf9a911ec240be6056334f53c045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 10 May 2016 22:19:51 +0200 Subject: [PATCH] [EC2] Update of the Amazon image list in the examples and tests --- etc/backends/ec2/development.yml | 6 +++--- etc/backends/ec2/test.yml | 6 +++--- examples/etc/apache2/sites-available/occi-ssl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/backends/ec2/development.yml b/etc/backends/ec2/development.yml index f9166944..c2fe34cb 100644 --- a/etc/backends/ec2/development.yml +++ b/etc/backends/ec2/development.yml @@ -8,9 +8,9 @@ aws_availability_zone: eu-west-1a image_filtering: policy: only_listed # 'only_listed' or 'only_owned' or 'owned_and_listed' or 'all' image_list: - - ami-896c96fe - - ami-f7f03d80 - - ami-4a5fb53d + - ami-8b8c57f8 + - ami-f4278487 + - ami-f95ef58a network_create_allowed: false network_destroy_allowed: false network_destroy_vpn_gws: false diff --git a/etc/backends/ec2/test.yml b/etc/backends/ec2/test.yml index f9166944..c2fe34cb 100644 --- a/etc/backends/ec2/test.yml +++ b/etc/backends/ec2/test.yml @@ -8,9 +8,9 @@ aws_availability_zone: eu-west-1a image_filtering: policy: only_listed # 'only_listed' or 'only_owned' or 'owned_and_listed' or 'all' image_list: - - ami-896c96fe - - ami-f7f03d80 - - ami-4a5fb53d + - ami-8b8c57f8 + - ami-f4278487 + - ami-f95ef58a network_create_allowed: false network_destroy_allowed: false network_destroy_vpn_gws: false diff --git a/examples/etc/apache2/sites-available/occi-ssl b/examples/etc/apache2/sites-available/occi-ssl index 6899d8ea..1e7963ab 100644 --- a/examples/etc/apache2/sites-available/occi-ssl +++ b/examples/etc/apache2/sites-available/occi-ssl @@ -107,7 +107,7 @@ #SetEnv ROCCI_SERVER_EC2_AWS_ENDPOINT "" SetEnv ROCCI_SERVER_EC2_AWS_AVAILABILITY_ZONE eu-west-1a SetEnv ROCCI_SERVER_EC2_IMAGE_FILTERING_POLICY only_listed - SetEnv ROCCI_SERVER_EC2_IMAGE_FILTERING_IMAGE_LIST "ami-896c96fe ami-f7f03d80 ami-4a5fb53d" + SetEnv ROCCI_SERVER_EC2_IMAGE_FILTERING_IMAGE_LIST "ami-8b8c57f8 ami-f4278487 ami-f95ef58a" SetEnv ROCCI_SERVER_EC2_NETWORK_CREATE_ALLOWED no SetEnv ROCCI_SERVER_EC2_NETWORK_DESTROY_ALLOWED no SetEnv ROCCI_SERVER_EC2_NETWORK_DESTROY_VPN_GWS no