From 9a4e30541e9be2f9b54a51f6d2a77131d073e198 Mon Sep 17 00:00:00 2001 From: Naga Ravi Chaitanya Elluri Date: Thu, 1 Feb 2018 12:14:29 -0500 Subject: Parameterize user and disable_root options in cloud config This commit will allow the user to login as root. By default, the user is set to openshift and disable_root is set to true. --- roles/openshift_openstack/defaults/main.yml | 5 +++++ roles/openshift_openstack/templates/user_data.j2 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'roles/openshift_openstack') diff --git a/roles/openshift_openstack/defaults/main.yml b/roles/openshift_openstack/defaults/main.yml index 77be1f2b1..2bdb81632 100644 --- a/roles/openshift_openstack/defaults/main.yml +++ b/roles/openshift_openstack/defaults/main.yml @@ -93,3 +93,8 @@ openshift_openstack_node_volume_size: "{{ openshift_openstack_docker_volume_size openshift_openstack_etcd_volume_size: 2 openshift_openstack_lb_volume_size: 5 openshift_openstack_ephemeral_volumes: false + + +# cloud-config +openshift_openstack_disable_root: true +openshift_openstack_user: openshift diff --git a/roles/openshift_openstack/templates/user_data.j2 b/roles/openshift_openstack/templates/user_data.j2 index eb65f7cec..ccaa5d464 100644 --- a/roles/openshift_openstack/templates/user_data.j2 +++ b/roles/openshift_openstack/templates/user_data.j2 @@ -1,9 +1,9 @@ #cloud-config -disable_root: true +disable_root: {{ openshift_openstack_disable_root }} system_info: default_user: - name: openshift + name: {{ openshift_openstack_user }} sudo: ["ALL=(ALL) NOPASSWD: ALL"] write_files: -- cgit v1.2.1