From 0cae017161b71e7c9e7c09cfc794672ecc6f897d Mon Sep 17 00:00:00 2001 From: Mangirdas Date: Fri, 26 Aug 2016 16:12:23 +0100 Subject: add run_once to repeatable actions --- playbooks/adhoc/metrics_setup/playbooks/install.yml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'playbooks/adhoc') diff --git a/playbooks/adhoc/metrics_setup/playbooks/install.yml b/playbooks/adhoc/metrics_setup/playbooks/install.yml index 235f775ef..1aac8acb1 100644 --- a/playbooks/adhoc/metrics_setup/playbooks/install.yml +++ b/playbooks/adhoc/metrics_setup/playbooks/install.yml @@ -16,21 +16,26 @@ - name: "Add metrics-deployer" command: "{{item}}" + run_once: true with_items: - oc project openshift-infra - oc create -f /tmp/metrics-deployer-setup.yaml - name: "Give metrics-deployer SA permissions" command: "oadm policy add-role-to-user edit system:serviceaccount:openshift-infra:metrics-deployer" + run_once: true - name: "Give heapster SA permissions" command: "oadm policy add-cluster-role-to-user cluster-reader system:serviceaccount:openshift-infra:heapster" + run_once: true - name: "Create metrics-deployer secret" command: "oc secrets new metrics-deployer nothing=/dev/null" + run_once: true - name: "Copy metrics.yaml to remote" copy: "src=../files/metrics.yaml dest=/tmp/metrics.yaml force=yes" - name: "Process yml template" shell: "oc process -f /tmp/metrics.yaml -v MASTER_URL={{ masterPublicURL }},REDEPLOY=true,HAWKULAR_METRICS_HOSTNAME={{ metrics_external_service }},IMAGE_PREFIX={{ metrics_image_prefix }},IMAGE_VERSION={{ metrics_image_version }},USE_PERSISTENT_STORAGE=false | oc create -f -" + run_once: true \ No newline at end of file -- cgit v1.2.1 From 91e5f3ada096d5a6e5bb6fc5de267990f99fcc6a Mon Sep 17 00:00:00 2001 From: Mangirdas Date: Fri, 26 Aug 2016 16:34:08 +0100 Subject: add check for server and account already exist --- playbooks/adhoc/metrics_setup/playbooks/install.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'playbooks/adhoc') diff --git a/playbooks/adhoc/metrics_setup/playbooks/install.yml b/playbooks/adhoc/metrics_setup/playbooks/install.yml index 1aac8acb1..a9ec3c1ef 100644 --- a/playbooks/adhoc/metrics_setup/playbooks/install.yml +++ b/playbooks/adhoc/metrics_setup/playbooks/install.yml @@ -17,6 +17,8 @@ - name: "Add metrics-deployer" command: "{{item}}" run_once: true + register: output + failed_when: ('already exists' not in output.stderr) and (output.rc != 0) with_items: - oc project openshift-infra - oc create -f /tmp/metrics-deployer-setup.yaml @@ -31,6 +33,8 @@ - name: "Create metrics-deployer secret" command: "oc secrets new metrics-deployer nothing=/dev/null" + register: output + failed_when: ('already exists' not in output.stderr) and (output.rc != 0) run_once: true - name: "Copy metrics.yaml to remote" -- cgit v1.2.1