summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2018-01-09 09:24:08 -0500
committerGitHub <noreply@github.com>2018-01-09 09:24:08 -0500
commit4ac04c4d389f9b77ff67d7f624ab8df0f57c9a01 (patch)
tree7e20807ee56b77c55c30827e8dfbee22d59b141f
parentb144534935e3bcfadd7af34fa0eb18f4cbac8d8b (diff)
parent3623bb6d344164f3f071f25ea4fcd99d7f1a7f3a (diff)
downloadopenshift-4ac04c4d389f9b77ff67d7f624ab8df0f57c9a01.tar.gz
openshift-4ac04c4d389f9b77ff67d7f624ab8df0f57c9a01.tar.bz2
openshift-4ac04c4d389f9b77ff67d7f624ab8df0f57c9a01.tar.xz
openshift-4ac04c4d389f9b77ff67d7f624ab8df0f57c9a01.zip
Merge pull request #6659 from joelddiaz/ami_and_docker_storage_setup
docker storage setup for ami building
-rw-r--r--playbooks/aws/provisioning_vars.yml.example5
-rw-r--r--roles/openshift_aws/tasks/provision_instance.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/playbooks/aws/provisioning_vars.yml.example b/playbooks/aws/provisioning_vars.yml.example
index 2eb7d23d4..f6b1a6b5d 100644
--- a/playbooks/aws/provisioning_vars.yml.example
+++ b/playbooks/aws/provisioning_vars.yml.example
@@ -93,6 +93,11 @@ openshift_aws_ssh_key_name: # myuser_key
# --------- #
# Variables in this section apply to building a node AMI for use in your
# openshift cluster.
+# openshift-ansible will perform the container runtime storage setup when specified
+# The current storage setup with require a drive if using a separate storage device
+# for the container runtime.
+container_runtime_docker_storage_type: overlay2
+container_runtime_docker_storage_setup_device: /dev/xvdb
# must specify a base_ami when building an AMI
openshift_aws_base_ami: # ami-12345678
diff --git a/roles/openshift_aws/tasks/provision_instance.yml b/roles/openshift_aws/tasks/provision_instance.yml
index 7eadd1522..786db1570 100644
--- a/roles/openshift_aws/tasks/provision_instance.yml
+++ b/roles/openshift_aws/tasks/provision_instance.yml
@@ -42,5 +42,5 @@
- name: add host to nodes
add_host:
- groups: nodes
+ groups: nodes,g_new_node_hosts
name: "{{ instancesout.instances[0].public_dns_name }}"