added dynamic inventory support for single-master clusters

2 files changed, 6 insertions, 11 deletions

diff --git a/playbooks/adhoc/s3_registry/s3_registry.j2 b/playbooks/adhoc/s3_registry/s3_registry.j2
index eb8660f6c..026b24456 100644
--- a/playbooks/adhoc/s3_registry/s3_registry.j2
+++ b/playbooks/adhoc/s3_registry/s3_registry.j2
@@ -10,7 +10,7 @@ storage:
     accesskey: {{ accesskey }}
     secretkey: {{ secretkey }}
     region: us-east-1
-    bucket: {{ bucketname }}
+    bucket: {{ clusterid }}-docker
     encrypt: true
     secure: true
     v4auth: true
diff --git a/playbooks/adhoc/s3_registry/s3_registry.yml b/playbooks/adhoc/s3_registry/s3_registry.yml
index 61280df0b..30b873db3 100644
--- a/playbooks/adhoc/s3_registry/s3_registry.yml
+++ b/playbooks/adhoc/s3_registry/s3_registry.yml
@@ -1,17 +1,12 @@
 ---
-# This playbook creates an S3 bucket, if it doesn't already exist, and configures the docker registry service to use the bucket as its backend storage.
+# This playbook creates an S3 bucket named after your cluster and configures the docker-registry service to use the bucket as its backend storage.
 # Usage:
-#  ansible-playbook s3_registry.yml -e bucketname="mybucket" -e accesskey="S3 aws access key" -e secretkey="S3 aws secret key" -e master="master fqdn or IP" -i "master,"
+#  ansible-playbook s3_registry.yml -e accesskey="S3 aws access key" -e secretkey="S3 aws secret key" -e clusterid="mycluster"
 #
-# Example:
-#  ansible-playbook s3_registry.yml -e accesskey="asdf" -e secretkey="hjkl" -e bucketname="testbucket" -e master="54.173.148.238" -i "54.173.148.238,"
-#
-# The bucket name can be anything, but generally should correspond with your cluster name.
 # The AWS access/secret keys should be the keys of a separate user (not your main user), containing only the necessary S3 access role.
-# The 'master' param is the fqdn or public IP of your cluster's master.
-# The -i param allows this playbook to be run on your master, even if it's not yet in your main inventory file. (The comma is mandatory).
+# The 'clusterid' is the short name of your cluster.
 
-- hosts: "{{ master }}"
+- hosts: security_group_{{ clusterid }}_master
   remote_user: root
   gather_facts: False
 
@@ -19,7 +14,7 @@
 
   - name: Create S3 bucket
     local_action:
-      module: s3 bucket={{ bucketname|quote }} mode=create aws_access_key={{ accesskey|quote }} aws_secret_key={{ secretkey|quote }}
+      module: s3 bucket="{{ clusterid }}-docker" mode=create aws_access_key={{ accesskey|quote }} aws_secret_key={{ secretkey|quote }}
 
   - name: Generate docker registry config
     template: src="s3_registry.j2" dest="/root/config.yml" owner=root mode=0600