diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-02 19:04:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 19:04:34 -0800 |
| commit | 2a0eb131853c9dbbe5b2e4f4b5a61da08bf2421f (patch) | |
| tree | 8a403ebcb0bc06523456dc9823c4da2ca3dbdab1 | |
| parent | baca4fb2053081a5b91d55ca1187a1e6a9853645 (diff) | |
| parent | 9a4e30541e9be2f9b54a51f6d2a77131d073e198 (diff) | |
| download | openshift-2a0eb131853c9dbbe5b2e4f4b5a61da08bf2421f.tar.gz openshift-2a0eb131853c9dbbe5b2e4f4b5a61da08bf2421f.tar.bz2 openshift-2a0eb131853c9dbbe5b2e4f4b5a61da08bf2421f.tar.xz openshift-2a0eb131853c9dbbe5b2e4f4b5a61da08bf2421f.zip | |
Merge pull request #6988 from chaitanyaenr/allow_root
Automatic merge from submit-queue.
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.
| -rw-r--r-- | roles/openshift_openstack/defaults/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_openstack/templates/user_data.j2 | 4 |
2 files changed, 7 insertions, 2 deletions
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: |