diff options
| -rw-r--r-- | playbooks/openstack/advanced-configuration.md | 6 | ||||
| -rw-r--r-- | roles/openshift_openstack/templates/user_data.j2 | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/openstack/advanced-configuration.md b/playbooks/openstack/advanced-configuration.md index a690f2d45..8df3c40b0 100644 --- a/playbooks/openstack/advanced-configuration.md +++ b/playbooks/openstack/advanced-configuration.md @@ -273,7 +273,7 @@ openshift_openstack_cluster_node_labels: mylabel: myvalue ``` -`openshift_openstack_cloud_init_runcmd` allows users to execute +`openshift_openstack_provision_user_commands` allows users to execute shell commands via cloud-init for all of the created Nova servers in the Heat stack, before they are available for SSH connections. Note that you should use custom ansible playbooks whenever @@ -293,7 +293,7 @@ The playbook leverages a two existing provider interfaces: `provision.yml` and servers, the cloud-init runcmd directive may be a better choice though. User specified shell commands for cloud-init need to be either strings or lists, for example: ``` -- openshift_openstack_cloud_init_runcmd: +- openshift_openstack_provision_user_commands: - set -vx - systemctl stop sshd # fences off ansible playbooks as we want to reboot later - ['echo', 'foo', '>', '/tmp/foo'] @@ -302,7 +302,7 @@ shell commands for cloud-init need to be either strings or lists, for example: ``` **Note** To protect Nova servers from recreating when the user-data changes via -`openshift_openstack_cloud_init_runcmd`, the +`openshift_openstack_provision_user_commands`, the `user_data_update_policy` parameter configured to `IGNORE` for Heat resources. The `openshift_openstack_nodes_to_remove` allows you to specify the numerical indexes diff --git a/roles/openshift_openstack/templates/user_data.j2 b/roles/openshift_openstack/templates/user_data.j2 index 352744285..1ca87a429 100644 --- a/roles/openshift_openstack/templates/user_data.j2 +++ b/roles/openshift_openstack/templates/user_data.j2 @@ -12,11 +12,11 @@ write_files: content: | Defaults:openshift !requiretty -{% if openshift_openstack_cloud_init_runcmd %} +{% if openshift_openstack_provision_user_commands %} - path: /root/ansible_install.sh permissions: '0544' content: | -{% for cmd in openshift_openstack_cloud_init_runcmd %} +{% for cmd in openshift_openstack_provision_user_commands %} {% if cmd is string %} {{ cmd }} {% elif cmd is iterable %} |