diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-28 14:00:23 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-28 14:00:23 -0400 |
| commit | 8dd04af47c574a0e4c98f5cab55283be04fa1683 (patch) | |
| tree | 7fa25006f802a36feb8db5af2a2f7b60abba42ca /roles/openshift_master_cluster | |
| parent | 68223f205b6c4e6ea124ccc982cd9bbcba63ced6 (diff) | |
| parent | 1b3fff6248fbd6788a26ee2b6c60f7731891c0f4 (diff) | |
| download | openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.gz openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.bz2 openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.tar.xz openshift-8dd04af47c574a0e4c98f5cab55283be04fa1683.zip | |
Merge pull request #512 from sdodson/next
Merge in Atomic Enterprise work into master
Diffstat (limited to 'roles/openshift_master_cluster')
| -rw-r--r-- | roles/openshift_master_cluster/tasks/configure.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_master_cluster/tasks/configure_deferred.yml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/openshift_master_cluster/tasks/configure.yml b/roles/openshift_master_cluster/tasks/configure.yml index 8ddc8bfda..7ab9afb51 100644 --- a/roles/openshift_master_cluster/tasks/configure.yml +++ b/roles/openshift_master_cluster/tasks/configure.yml @@ -22,14 +22,14 @@ command: pcs resource defaults resource-stickiness=100 - name: Add the cluster VIP resource - command: pcs resource create virtual-ip IPaddr2 ip={{ openshift_master_cluster_vip }} --group openshift-master + command: pcs resource create virtual-ip IPaddr2 ip={{ openshift_master_cluster_vip }} --group {{ openshift.common.service_type }}-master - name: Add the cluster public VIP resource - command: pcs resource create virtual-ip IPaddr2 ip={{ openshift_master_cluster_public_vip }} --group openshift-master + command: pcs resource create virtual-ip IPaddr2 ip={{ openshift_master_cluster_public_vip }} --group {{ openshift.common.service_type }}-master when: openshift_master_cluster_public_vip != openshift_master_cluster_vip -- name: Add the cluster openshift-master service resource - command: pcs resource create master systemd:openshift-master op start timeout=90s stop timeout=90s --group openshift-master +- name: Add the cluster master service resource + command: pcs resource create master systemd:{{ openshift.common.service_type }}-master op start timeout=90s stop timeout=90s --group {{ openshift.common.service_type }}-master - name: Disable stonith command: pcs property set stonith-enabled=false diff --git a/roles/openshift_master_cluster/tasks/configure_deferred.yml b/roles/openshift_master_cluster/tasks/configure_deferred.yml index a80b6c5b4..3b416005b 100644 --- a/roles/openshift_master_cluster/tasks/configure_deferred.yml +++ b/roles/openshift_master_cluster/tasks/configure_deferred.yml @@ -1,8 +1,8 @@ --- - debug: msg="Deferring config" -- name: Start and enable openshift-master +- name: Start and enable the master service: - name: openshift-master + name: "{{ openshift.common.service_type }}-master" state: started enabled: yes |