summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-11 13:37:14 -0400
committerGitHub <noreply@github.com>2017-09-11 13:37:14 -0400
commit942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa (patch)
treed41c40877e3e83fb72ba13f1b8c43176f894177f
parent69f03840248a0adadb38b73d9155393af9b069fb (diff)
parent22f787280a95e159113cc594e0480d59b2642ade (diff)
downloadopenshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.tar.gz
openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.tar.bz2
openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.tar.xz
openshift-942ea3e1eff6f8557c52768ebe76dd1e9a5b99aa.zip
Merge pull request #5332 from kwoodson/amibuild_node_config
Merged by openshift-bot
-rw-r--r--playbooks/aws/README.md7
-rw-r--r--playbooks/aws/openshift-cluster/build_ami.yml11
-rw-r--r--playbooks/aws/openshift-cluster/provisioning_vars.example.yml2
-rw-r--r--playbooks/common/openshift-node/config.yml1
4 files changed, 12 insertions, 9 deletions
diff --git a/playbooks/aws/README.md b/playbooks/aws/README.md
index c2da4b632..2b3d4329e 100644
--- a/playbooks/aws/README.md
+++ b/playbooks/aws/README.md
@@ -43,6 +43,8 @@ The current expected work flow should be to provide an AMI with access to Opensh
```yaml
---
+# when creating an AMI set this to True
+# when installing a cluster set this to False
openshift_node_bootstrap: True
# specify a clusterid
@@ -96,6 +98,11 @@ etcd
################################################################################
# openshift_deployment_type is required for installation
openshift_deployment_type=origin
+
+# required when building an AMI. This will
+# be dependent on the version provided by the yum repository
+openshift_pkg_version=-3.6.0
+
openshift_master_bootstrap_enabled=True
openshift_hosted_router_wait=False
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml
index d3c0057b5..fc11205d8 100644
--- a/playbooks/aws/openshift-cluster/build_ami.yml
+++ b/playbooks/aws/openshift-cluster/build_ami.yml
@@ -63,15 +63,8 @@
- name: run the std_include
include: ../../common/openshift-cluster/initialize_openshift_repos.yml
-- hosts: nodes
- remote_user: root
- tasks:
- - set_fact:
- openshift_node_bootstrap: True
-
- - name: run openshift image preparation
- include_role:
- name: openshift_node
+- name: install node config
+ include: ../../common/openshift-node/config.yml
- hosts: localhost
connection: local
diff --git a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml b/playbooks/aws/openshift-cluster/provisioning_vars.example.yml
index 5a30ad3a5..28eb9c993 100644
--- a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml
+++ b/playbooks/aws/openshift-cluster/provisioning_vars.example.yml
@@ -1,4 +1,6 @@
---
+# when creating an AMI set this option to True
+# when installing the cluster, set this to False
openshift_node_bootstrap: True
# specify a clusterid
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index c7afc78ac..0801c41ff 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -82,6 +82,7 @@
- role: nickhammond.logrotate
- role: openshift_manage_node
openshift_master_host: "{{ groups.oo_first_master.0 }}"
+ when: not openshift_node_bootstrap | default(False)
tasks:
- name: Create group for deployment type
group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}