diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-06-01 14:38:06 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-06-01 14:38:06 -0400 |
| commit | 54186e0e5022a827e6ffdeaffabcb5403bebe6e6 (patch) | |
| tree | adabc2eab84c557b68438bcdf3bf4bf721361cfe /playbooks/common/openshift-cluster | |
| parent | 1c6787d2692a8060580b0e6ff37a26b87d08c701 (diff) | |
| parent | 708fbb0b85a76dbbef41fe6a9ae646c8662c77d9 (diff) | |
| download | openshift-54186e0e5022a827e6ffdeaffabcb5403bebe6e6.tar.gz openshift-54186e0e5022a827e6ffdeaffabcb5403bebe6e6.tar.bz2 openshift-54186e0e5022a827e6ffdeaffabcb5403bebe6e6.tar.xz openshift-54186e0e5022a827e6ffdeaffabcb5403bebe6e6.zip | |
Merge pull request #1957 from jfcoz/metrics_wait_deployer
wait metrics-deployer complete (need to configure nodes before hosted…
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/additional_config.yml | 23 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 23 |
2 files changed, 24 insertions, 22 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml index 5ed1d3b3c..ebddc7841 100644 --- a/playbooks/common/openshift-cluster/additional_config.yml +++ b/playbooks/common/openshift-cluster/additional_config.yml @@ -28,25 +28,4 @@ - role: flannel_register when: openshift.common.use_flannel | bool -- name: Create persistent volumes and create hosted services - hosts: oo_first_master - vars: - attach_registry_volume: "{{ openshift.hosted.registry.storage.kind != None }}" - deploy_infra: "{{ openshift.master.infra_nodes | default([]) | length > 0 }}" - persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}" - persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}" - roles: - - role: openshift_persistent_volumes - when: persistent_volumes | length > 0 or persistent_volume_claims | length > 0 - - role: openshift_serviceaccounts - openshift_serviceaccounts_names: - - router - - registry - openshift_serviceaccounts_namespace: default - openshift_serviceaccounts_sccs: - - privileged - - role: openshift_registry - registry_volume_claim: "{{ openshift.hosted.registry.storage.volume.name }}-claim" - when: deploy_infra | bool and attach_registry_volume | bool - - role: openshift_metrics - when: openshift.hosted.metrics.deploy | bool + diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index babb5ea71..811b3d685 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -1,3 +1,26 @@ +- name: Create persistent volumes and create hosted services + hosts: oo_first_master + vars: + attach_registry_volume: "{{ openshift.hosted.registry.storage.kind != None }}" + deploy_infra: "{{ openshift.master.infra_nodes | default([]) | length > 0 }}" + persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}" + persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}" + roles: + - role: openshift_persistent_volumes + when: persistent_volumes | length > 0 or persistent_volume_claims | length > 0 + - role: openshift_serviceaccounts + openshift_serviceaccounts_names: + - router + - registry + openshift_serviceaccounts_namespace: default + openshift_serviceaccounts_sccs: + - privileged + - role: openshift_registry + registry_volume_claim: "{{ openshift.hosted.registry.storage.volume.name }}-claim" + when: deploy_infra | bool and attach_registry_volume | bool + - role: openshift_metrics + when: openshift.hosted.metrics.deploy | bool + - name: Create Hosted Resources hosts: oo_first_master pre_tasks: |