diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index cd7fd96679..d2243c576d 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -134,8 +134,11 @@ tasks: - name: Scale up pods - command: oc -n bodhi scale dc/bodhi-web --replicas={{ openshift_pods }} - when: migrations + command: oc -n bodhi scale dc/bodhi-web --replicas={{ groupvars['bodhi2']['openshift_pods'] }} + when: migrations and env != "staging" + - name: Scale up pods + command: oc -n bodhi scale dc/bodhi-web --replicas={{ groupvars['bodhi2-stg']['openshift_pods'] }} + when: migrations and env == "staging" post_tasks: - name: tell nagios to unshush w.r.t. the frontend diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index bbd059f63c..90e67afd6b 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -78,7 +78,7 @@ servicename: bodhi-web - role: openshift/object app: bodhi - file: deploymentconfig.yml + template: deploymentconfig.yml objectname: deploymentconfig.yml - role: openshift/rollout app: bodhi diff --git a/roles/openshift-apps/bodhi/files/deploymentconfig.yml b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml similarity index 93% rename from roles/openshift-apps/bodhi/files/deploymentconfig.yml rename to roles/openshift-apps/bodhi/templates/deploymentconfig.yml index cab1f48f9e..8f59c98d80 100644 --- a/roles/openshift-apps/bodhi/files/deploymentconfig.yml +++ b/roles/openshift-apps/bodhi/templates/deploymentconfig.yml @@ -8,7 +8,11 @@ items: service: web name: bodhi-web spec: - replicas: 2 + {% if env == "staging" %} + replicas: {{ groupvars['bodhi2-stg']['openshift_pods'] }} + {% else %} + replicas: {{ groupvars['bodhi2']['openshift_pods'] }} + {% endif %} selector: deploymentconfig: bodhi-web strategy: