From 3b0ef37a385f1a8510d1b2bc2b024ee8ea0f510e Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Fri, 29 Apr 2016 17:23:24 -0400
Subject: openstack_fixes
- move openstack user-data content into heat template
---
playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 8 +++++++-
playbooks/openstack/openshift-cluster/files/user-data | 13 -------------
2 files changed, 7 insertions(+), 14 deletions(-)
delete mode 100644 playbooks/openstack/openshift-cluster/files/user-data
(limited to 'playbooks/openstack/openshift-cluster/files')
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
index 2f05c3adc..1d54a9c39 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
@@ -591,11 +591,17 @@ resources:
type: OS::Heat::MultipartMime
properties:
parts:
- - config: { get_file: user-data }
- config:
str_replace:
template: |
#cloud-config
+ disable_root: true
+
+ system_info:
+ default_user:
+ name: openshift
+ sudo: ["ALL=(ALL) NOPASSWD: ALL"]
+
write_files:
- path: /etc/sudoers.d/00-openshift-no-requiretty
permissions: 440
diff --git a/playbooks/openstack/openshift-cluster/files/user-data b/playbooks/openstack/openshift-cluster/files/user-data
deleted file mode 100644
index eb65f7cec..000000000
--- a/playbooks/openstack/openshift-cluster/files/user-data
+++ /dev/null
@@ -1,13 +0,0 @@
-#cloud-config
-disable_root: true
-
-system_info:
- default_user:
- name: openshift
- sudo: ["ALL=(ALL) NOPASSWD: ALL"]
-
-write_files:
- - path: /etc/sudoers.d/00-openshift-no-requiretty
- permissions: 440
- content: |
- Defaults:openshift !requiretty
--
cgit v1.2.3
From 31be08a7e02c64c3ac59c6a6b0fc26e714f3e6ab Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 5 May 2016 21:34:26 -0400
Subject: add user-data file back to openstack provisioner
---
playbooks/openstack/openshift-cluster/files/user-data | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 playbooks/openstack/openshift-cluster/files/user-data
(limited to 'playbooks/openstack/openshift-cluster/files')
diff --git a/playbooks/openstack/openshift-cluster/files/user-data b/playbooks/openstack/openshift-cluster/files/user-data
new file mode 100644
index 000000000..eb65f7cec
--- /dev/null
+++ b/playbooks/openstack/openshift-cluster/files/user-data
@@ -0,0 +1,13 @@
+#cloud-config
+disable_root: true
+
+system_info:
+ default_user:
+ name: openshift
+ sudo: ["ALL=(ALL) NOPASSWD: ALL"]
+
+write_files:
+ - path: /etc/sudoers.d/00-openshift-no-requiretty
+ permissions: 440
+ content: |
+ Defaults:openshift !requiretty
--
cgit v1.2.3