diff options
| author | glennswest <gwest@redhat.com> | 2017-10-06 21:02:05 +0800 |
|---|---|---|
| committer | glennswest <gwest@redhat.com> | 2017-10-06 21:02:05 +0800 |
| commit | 78c723141edbae57b1fb87ad9e015296c37e5d00 (patch) | |
| tree | 1b7c2e5656773ae38867620d1080157fd9a4d26b | |
| parent | 00ecbbf16756367abef89482b10e721770301b09 (diff) | |
| parent | 1c73318927fe1730fa4c52fc684a94d37d12a5fd (diff) | |
| download | openshift-78c723141edbae57b1fb87ad9e015296c37e5d00.tar.gz openshift-78c723141edbae57b1fb87ad9e015296c37e5d00.tar.bz2 openshift-78c723141edbae57b1fb87ad9e015296c37e5d00.tar.xz openshift-78c723141edbae57b1fb87ad9e015296c37e5d00.zip | |
Merge branch 'master' of https://github.com/openshift/openshift-ansible-contrib
Merge upstream commits
| -rw-r--r-- | playbooks/provisioning/openstack/pre_tasks.yml | 2 | ||||
| -rw-r--r-- | roles/openstack-stack/README.md | 2 | ||||
| -rw-r--r-- | roles/openstack-stack/tasks/generate-templates.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/provisioning/openstack/pre_tasks.yml b/playbooks/provisioning/openstack/pre_tasks.yml index 7146c886a..11fe2dd84 100644 --- a/playbooks/provisioning/openstack/pre_tasks.yml +++ b/playbooks/provisioning/openstack/pre_tasks.yml @@ -7,7 +7,7 @@ - name: Set default Environment ID set_fact: - default_env_id: "casl-{{ lookup('env','OS_USERNAME') }}-{{ env_random_id }}" + default_env_id: "openshift-{{ lookup('env','OS_USERNAME') }}-{{ env_random_id }}" delegate_to: localhost - name: Setting Common Facts diff --git a/roles/openstack-stack/README.md b/roles/openstack-stack/README.md index 509c9de6c..32a2b49f1 100644 --- a/roles/openstack-stack/README.md +++ b/roles/openstack-stack/README.md @@ -5,5 +5,5 @@ Role for spinning up instances using OpenStack Heat. ## To Test ``` -ansible-playbook casl-ansible/roles/openstack-stack/test/stack-create-test.yml +ansible-playbook openshift-ansible-contrib/roles/openstack-stack/test/stack-create-test.yml ``` diff --git a/roles/openstack-stack/tasks/generate-templates.yml b/roles/openstack-stack/tasks/generate-templates.yml index 0ce9a3eec..110da8444 100644 --- a/roles/openstack-stack/tasks/generate-templates.yml +++ b/roles/openstack-stack/tasks/generate-templates.yml @@ -3,7 +3,7 @@ register: stack_template_pre tempfile: state: directory - prefix: casl-ansible + prefix: openshift-ansible - name: set template paths set_fact: |