aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Wieczorek <p.wieczorek2@samsung.com>2021-01-29 11:22:22 +0100
committerPawel Wieczorek <p.wieczorek2@samsung.com>2021-01-29 11:22:24 +0100
commitcda6d6036449f37692b7ff6be571dd335689732b (patch)
tree7c033f1c8758035d0281f39cda2b1b2786b6e475
parented760541eb52cf211bda363a63f2da07becd94c8 (diff)
Divide host group into cluster and operation instances
Issue-ID: INT-1601 Change-Id: I799f15077437bcd836c5a38a004d974eed64f707 Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
-rw-r--r--deployment/noheat/infra-openstack/ansible/create.yml2
-rw-r--r--deployment/noheat/infra-openstack/ansible/destroy.yml2
-rw-r--r--deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample8
-rw-r--r--deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sm-onap8
4 files changed, 16 insertions, 4 deletions
diff --git a/deployment/noheat/infra-openstack/ansible/create.yml b/deployment/noheat/infra-openstack/ansible/create.yml
index 2b7cf6366..74d6d1f44 100644
--- a/deployment/noheat/infra-openstack/ansible/create.yml
+++ b/deployment/noheat/infra-openstack/ansible/create.yml
@@ -8,6 +8,8 @@
- openstack/create_devstack_securitygroup
- openstack/create_devstack_keypair
- role: openstack/create_devstack_hosts
+ hosts: "{{ operation.hosts }}"
+ - role: openstack/create_devstack_hosts
hosts: "{{ cluster.hosts }}"
- name: Create cluster operator access keypair
hosts: "operator0"
diff --git a/deployment/noheat/infra-openstack/ansible/destroy.yml b/deployment/noheat/infra-openstack/ansible/destroy.yml
index c85f17a02..ca1455f5f 100644
--- a/deployment/noheat/infra-openstack/ansible/destroy.yml
+++ b/deployment/noheat/infra-openstack/ansible/destroy.yml
@@ -6,6 +6,8 @@
roles:
- role: openstack/destroy_devstack_hosts
hosts: "{{ cluster.hosts }}"
+ - role: openstack/destroy_devstack_hosts
+ hosts: "{{ operation.hosts }}"
- openstack/destroy_devstack_keypair
- openstack/destroy_devstack_network
- openstack/destroy_devstack_securitygroup
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 7ca72de10..72d37a303 100644
--- a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample
+++ b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample
@@ -16,8 +16,8 @@ image:
name: &image_name "Ubuntu_18.04"
user: "ubuntu"
-cluster:
- name: "cluster0"
+operation:
+ name: "operation0"
hosts:
- name: "operator0"
image: *image_name
@@ -26,6 +26,10 @@ cluster:
network: *network_name
securitygroup: *securitygroup_name
volume_size: 5
+
+cluster:
+ name: "cluster0"
+ hosts:
- name: "worker0"
image: *image_name
flavor: "m1.tiny"
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 e3ae6b346..744f91839 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
@@ -15,8 +15,8 @@ image:
name: &image_name "Ubuntu_18.04"
user: "ubuntu"
-cluster:
- name: "cluster0"
+operation:
+ name: "operation0"
hosts:
- name: "operator0"
image: *image_name
@@ -25,6 +25,10 @@ cluster:
network: *network_name
securitygroup: *securitygroup_name
volume_size: 20
+
+cluster:
+ name: "cluster0"
+ hosts:
- name: "control0"
image: *image_name
flavor: "m1.xlarge"