Merge pull request #160 from CodeNow/fix-registry

use new registry and correct s3 endpoints

Author: bkendall

ansible/beta-hosts/variables

@@ -36,6 +36,12 @@ optimus_github_deploy_keys_bucket=runnable.deploykeys.production-beta
 [palantiri:vars]
 palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
 
+[registry:vars]
+registry_s3_access_key=AKIAJK5EN7W6E62A3C3Q
+registry_s3_bucket=runnableimages.beta
+registry_s3_secret_key=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
+registry_s3_region=us-east-1
+
 [shiva:vars]
 aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q
 aws_secret_access_key=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
@@ -56,7 +62,4 @@ rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
 rabbit_port=54321
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.20.1.55
-registry_s3_access_key=AKIAJK5EN7W6E62A3C3Q
-registry_s3_bucket=runnableimages.beta
-registry_s3_secret_key=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
 user_content_domain=runnablecloud.com

ansible/group_vars/alpha-registry.yml

@@ -2,16 +2,14 @@
 name: "registry"
 
 container_image: "registry"
-container_tag: "2"
+container_tag: "2.1.1"
 hosted_ports: ["80"]
 
 container_envs: >
-  -e REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
   -e REGISTRY_STORAGE_S3_ACCESSKEY={{ registry_s3_access_key }}
   -e REGISTRY_STORAGE_S3_SECRETKEY={{ registry_s3_secret_key }}
-  -e REGISTRY_STORAGE_S3_REGION=us-east-1
+  -e REGISTRY_STORAGE_S3_REGION={{ registry_s3_region }}
   -e REGISTRY_STORAGE_S3_BUCKET={{ registry_s3_bucket }}
-  -e REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=runnableimages.beta
   -e REGISTRY_ENVIRONMENT=production
   -e REGISTRY_STORAGE=s3
 

ansible/prod-hosts/variables

@@ -36,6 +36,12 @@ optimus_github_deploy_keys_bucket=runnable.deploykeys.production
 [palantiri:vars]
 palantiri_rollbar_key=f675e9090d6f483ca4e742af2c7f2f83
 
+[registry:vars]
+registry_s3_access_key=AKIAJKCSFJCHFDITLBUQ
+registry_s3_bucket=runnableimages.alpha
+registry_s3_secret_key=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
+registry_s3_region=us-west-2
+
 [shiva:vars]
 aws_access_key_id=AKIAJ3RCYU6FCULAJP2Q
 aws_secret_access_key=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
@@ -56,7 +62,4 @@ rabbit_password=6df7983b76a22bbbffee11a29860cda8
 rabbit_port=54321
 rabbit_username=a4c1ac709c3bc685a6665fc1d23d737d
 registry_host=10.0.1.254
-registry_s3_access_key=AKIAJKCSFJCHFDITLBUQ
-registry_s3_bucket=runnableimages
-registry_s3_secret_key=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
 user_content_domain=runnableapp.com