diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-29 22:25:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 22:25:19 -0700 |
| commit | 1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd (patch) | |
| tree | 6daefe4dc950f91e7e864595fe38a31ed1c62876 /playbooks/aws | |
| parent | d1e51603d4cc7a3b7ad8381c730ac51ae4037139 (diff) | |
| parent | ba42e26ecfb8beda253fba0dc9a4c4c38dec9ec4 (diff) | |
| download | openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.tar.gz openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.tar.bz2 openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.tar.xz openshift-1ab0e6f8a9efe7c4fb47119db3d879e46d12d7bd.zip | |
Merge pull request #5565 from mgugino-upstream-stage/provisioning-centos-support
Automatic merge from submit-queue.
Changes necessary to support AMI building
Currently, AMI building does not work.
These changes implement the necessary steps to build
an AMI for usage as a 'golden node image'.
Diffstat (limited to 'playbooks/aws')
| -rw-r--r-- | playbooks/aws/openshift-cluster/build_ami.yml | 10 | ||||
| -rw-r--r-- | playbooks/aws/openshift-cluster/provision.yml | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml index 86b2a2544..1e54f0467 100644 --- a/playbooks/aws/openshift-cluster/build_ami.yml +++ b/playbooks/aws/openshift-cluster/build_ami.yml @@ -66,8 +66,14 @@ - name: run the std_include include: ../../common/openshift-cluster/initialize_openshift_repos.yml -- name: install node config - include: ../../common/openshift-node/config.yml +- name: run node config setup + include: ../../common/openshift-node/setup.yml + +- name: run node config + include: ../../common/openshift-node/configure_nodes.yml + +- name: Re-enable excluders + include: ../../common/openshift-node/enable_excluders.yml - hosts: localhost connection: local diff --git a/playbooks/aws/openshift-cluster/provision.yml b/playbooks/aws/openshift-cluster/provision.yml index db7afac6f..8f018abd0 100644 --- a/playbooks/aws/openshift-cluster/provision.yml +++ b/playbooks/aws/openshift-cluster/provision.yml @@ -11,7 +11,7 @@ debug: msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}" - - name: create default vpc + - name: provision cluster include_role: name: openshift_aws tasks_from: provision.yml |