tkummer33
2020-03-04 6bd9e1788aefb77690a38677a74b48fdb7caa1ea
Tkummer (#1227)

* add suport for custom osp_cloud_name

* add support for custom cloud names

* add os_cloud_name var templates for clouds.yaml.j2 template
4 files modified
11 ■■■■■ changed files
ansible/configs/ocp4-cluster/default_vars_osp.yml 3 ●●●●● patch | view | raw | blame | history
ansible/roles/host-ocp4-installer/templates/install-config.yaml.j2 2 ●●● patch | view | raw | blame | history
ansible/roles/host-ocp4-provisioner/tasks/osp_prereqs.yml 4 ●●●● patch | view | raw | blame | history
ansible/roles/host-ocp4-provisioner/templates/clouds.yaml.j2 2 ●●● patch | view | raw | blame | history
ansible/configs/ocp4-cluster/default_vars_osp.yml
@@ -17,6 +17,9 @@
# The name of the project that will be created in OpenStack for the user
osp_project_name: "{{ guid }}-project"
# The name of the cloud where ocp-cluster will be created
osp_cloud_name: "{{ osp_project_name }}"
# Set this to true if you need to create a new project in OpenStack
# This should almost always be set to true for OpenShift installations
# If it is set to false, the {{ osp_project_name }} must already exist and
ansible/roles/host-ocp4-installer/templates/install-config.yaml.j2
@@ -51,7 +51,7 @@
{% endif %}
{% if cloud_provider == 'osp' %}
  openstack:
    cloud: {{ osp_project_name }}
    cloud: {{ osp_cloud_name }}
    computeFlavor: 4c16g30d
    externalNetwork: external
    lbFloatingIP: {{ hostvars.localhost.ocp_api_fip }}
ansible/roles/host-ocp4-provisioner/tasks/osp_prereqs.yml
@@ -64,7 +64,7 @@
  lineinfile:
    path: "/home/{{ ansible_user }}/.bashrc"
    regexp: "^export OS_CLOUD"
    line: "export OS_CLOUD={{ osp_project_name }}"
    line: "export OS_CLOUD={{ osp_cloud_name }}"
- name: Create resources directory
  file:
@@ -76,6 +76,6 @@
- name: Set OpenStack Object Store Account
  command: >-
    openstack --os-cloud={{ osp_project_name }} object store account set
    openstack --os-cloud={{ osp_cloud_name }} object store account set
    --property Temp-URL-Key=somename
  become: no
ansible/roles/host-ocp4-provisioner/templates/clouds.yaml.j2
@@ -1,5 +1,5 @@
clouds:
  {{ osp_project_name }}:
  {{ osp_cloud_name }}:
    auth:
      auth_url: "{{ osp_auth_url }}"
{% if osp_project_create | bool %}