From 0f53d5976254ae288a8cca114497fd9feeebcc91 Mon Sep 17 00:00:00 2001 From: Gayane Osipyan Date: Wed, 15 Jan 2020 17:48:46 +0100 Subject: [PATCH] Add designate to QA scenarios --- .../cloud9/qa/no-ssl/qa-scenario-1a.yaml | 20 +++++++++++++- .../qa/ssl-insecure/qa-scenario-1a.yaml | 25 +++++++++++++++++- .../cloud9/qa/ssl/qa-scenario-1a.yaml | 26 ++++++++++++++++++- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/scripts/scenarios/cloud9/qa/no-ssl/qa-scenario-1a.yaml b/scripts/scenarios/cloud9/qa/no-ssl/qa-scenario-1a.yaml index 6f6b688b38..7c5467f7a6 100644 --- a/scripts/scenarios/cloud9/qa/no-ssl/qa-scenario-1a.yaml +++ b/scripts/scenarios/cloud9/qa/no-ssl/qa-scenario-1a.yaml @@ -1,6 +1,17 @@ --- # 1a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift proposals: +- barclamp: dns + attributes: + enable_designate: true + deployment: + elements: + dns-server: + - "@@crowbar@@" + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + dns-client: - barclamp: pacemaker name: services attributes: @@ -87,7 +98,14 @@ proposals: elements: glance-server: - cluster:services - +- barclamp: designate + attributes: + deployment: + elements: + designate-server: + - cluster:services + designate-worker: + - cluster:services - barclamp: cinder attributes: volumes: diff --git a/scripts/scenarios/cloud9/qa/ssl-insecure/qa-scenario-1a.yaml b/scripts/scenarios/cloud9/qa/ssl-insecure/qa-scenario-1a.yaml index 8d93eb0f16..34ce936d05 100644 --- a/scripts/scenarios/cloud9/qa/ssl-insecure/qa-scenario-1a.yaml +++ b/scripts/scenarios/cloud9/qa/ssl-insecure/qa-scenario-1a.yaml @@ -1,6 +1,17 @@ --- # 1a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift proposals: +- barclamp: dns + attributes: + enable_designate: true + deployment: + elements: + dns-server: + - "@@crowbar@@" + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + dns-client: - barclamp: pacemaker name: services attributes: @@ -114,7 +125,19 @@ proposals: elements: glance-server: - cluster:services - +- barclamp: designate + attributes: + api: + protocol: https + ssl: + generate_certs: true + insecure: true + deployment: + elements: + designate-server: + - cluster:services + designate-worker: + - cluster:services - barclamp: cinder attributes: volumes: diff --git a/scripts/scenarios/cloud9/qa/ssl/qa-scenario-1a.yaml b/scripts/scenarios/cloud9/qa/ssl/qa-scenario-1a.yaml index c72ed26805..450327907c 100644 --- a/scripts/scenarios/cloud9/qa/ssl/qa-scenario-1a.yaml +++ b/scripts/scenarios/cloud9/qa/ssl/qa-scenario-1a.yaml @@ -1,6 +1,17 @@ --- # 1a - 7 nodes: HA (IPMI 1 x 3), KVM x 1, Swift proposals: +- barclamp: dns + attributes: + enable_designate: true + deployment: + elements: + dns-server: + - "@@crowbar@@" + - "@@controller1@@" + - "@@controller2@@" + - "@@controller3@@" + dns-client: - barclamp: pacemaker name: services attributes: @@ -108,7 +119,20 @@ proposals: elements: glance-server: - cluster:services - +- barclamp: designate + attributes: + api: + protocol: https + ssl: + certfile: ##certfile## + keyfile: ##keyfile## + ca_certs: ##cafile## + deployment: + elements: + designate-server: + - cluster:services + designate-worker: + - cluster:services - barclamp: cinder attributes: volumes: