From f7dd723294912e4bb4484859ac263ab9270d70c6 Mon Sep 17 00:00:00 2001
From: Pawel Wieczorek <p.wieczorek2@samsung.com>
Date: Thu, 24 Dec 2020 09:42:55 +0100
Subject: Allow operator access to the cluster

This patch creates operator keypair and deploys its public key to all
machines in the cluster. Previously cluster could be accessed from
OpenStack admin machine only.

Additional information added to the "all.yml*" group variables allowed
keeping current roles generic and flexible.

Issue-ID: INT-1601
Change-Id: I6b289ff9a8c9ebe04562671b8f4b4468b543723f
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
---
 .../ansible/group_vars/all.yml.sample              |  29 ++++--
 .../ansible/group_vars/all.yml.sm-onap             | 100 +++++++++++----------
 2 files changed, 74 insertions(+), 55 deletions(-)

(limited to 'deployment/noheat/infra-openstack/ansible/group_vars')

diff --git a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample
index 5a7defeec..c2d551da6 100644
--- a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample
+++ b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample
@@ -10,11 +10,24 @@ securitygroup:
   name: &securitygroup_name "onap_ci_lab"
   remote_ip_prefix: "172.24.4.0/24"
 
-hosts:
-  - name: "operator0"
-    image: "Ubuntu_18.04"
-    flavor: "m1.tiny"
-    keypair: *keypair_name
-    network: *network_name
-    securitygroup: *securitygroup_name
-    volume_size: 5
+image:
+  name: &image_name "Ubuntu_18.04"
+  user: "ubuntu"
+
+cluster:
+  name: "cluster0"
+  hosts:
+    - name: "operator0"
+      image: *image_name
+      flavor: "m1.tiny"
+      keypair: *keypair_name
+      network: *network_name
+      securitygroup: *securitygroup_name
+      volume_size: 5
+    - name: "worker0"
+      image: *image_name
+      flavor: "m1.tiny"
+      keypair: *keypair_name
+      network: *network_name
+      securitygroup: *securitygroup_name
+      volume_size: 5
diff --git a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap
index fac94c58d..c6ded5605 100644
--- a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap
+++ b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap
@@ -10,50 +10,56 @@ securitygroup:
   name: &securitygroup_name "onap_ci_lab"
   remote_ip_prefix: "0.0.0.0/0"
 
-hosts:
-  - name: "operator0"
-    image: "Ubuntu_18.04"
-    flavor: "m1.xlarge"
-    keypair: *keypair_name
-    network: *network_name
-    securitygroup: *securitygroup_name
-    volume_size: 20
-  - name: "control0"
-    image: "Ubuntu_18.04"
-    flavor: "m1.xlarge"
-    keypair: *keypair_name
-    network: *network_name
-    securitygroup: *securitygroup_name
-    volume_size: 50
-  - name: "worker0a"
-    image: "Ubuntu_18.04"
-    flavor: "m1.2xlarge"
-    keypair: *keypair_name
-    network: *network_name
-    auto_ip: false
-    securitygroup: *securitygroup_name
-    volume_size: 80
-  - name: "worker0b"
-    image: "Ubuntu_18.04"
-    flavor: "m1.2xlarge"
-    keypair: *keypair_name
-    network: *network_name
-    auto_ip: false
-    securitygroup: *securitygroup_name
-    volume_size: 80
-  - name: "worker0c"
-    image: "Ubuntu_18.04"
-    flavor: "m1.2xlarge"
-    keypair: *keypair_name
-    network: *network_name
-    auto_ip: false
-    securitygroup: *securitygroup_name
-    volume_size: 80
-  - name: "nfs0"
-    image: "Ubuntu_18.04"
-    flavor: "m1.large"
-    keypair: *keypair_name
-    network: *network_name
-    auto_ip: false
-    securitygroup: *securitygroup_name
-    volume_size: 150
+image:
+  name: &image_name "Ubuntu_18.04"
+  user: "ubuntu"
+
+cluster:
+  name: "cluster0"
+  hosts:
+    - name: "operator0"
+      image: *image_name
+      flavor: "m1.xlarge"
+      keypair: *keypair_name
+      network: *network_name
+      securitygroup: *securitygroup_name
+      volume_size: 20
+    - name: "control0"
+      image: *image_name
+      flavor: "m1.xlarge"
+      keypair: *keypair_name
+      network: *network_name
+      securitygroup: *securitygroup_name
+      volume_size: 50
+    - name: "worker0a"
+      image: *image_name
+      flavor: "m1.2xlarge"
+      keypair: *keypair_name
+      network: *network_name
+      auto_ip: false
+      securitygroup: *securitygroup_name
+      volume_size: 80
+    - name: "worker0b"
+      image: *image_name
+      flavor: "m1.2xlarge"
+      keypair: *keypair_name
+      network: *network_name
+      auto_ip: false
+      securitygroup: *securitygroup_name
+      volume_size: 80
+    - name: "worker0c"
+      image: *image_name
+      flavor: "m1.2xlarge"
+      keypair: *keypair_name
+      network: *network_name
+      auto_ip: false
+      securitygroup: *securitygroup_name
+      volume_size: 80
+    - name: "nfs0"
+      image: *image_name
+      flavor: "m1.large"
+      keypair: *keypair_name
+      network: *network_name
+      auto_ip: false
+      securitygroup: *securitygroup_name
+      volume_size: 150
-- 
cgit 1.2.3-korg