From df00edd68426419d789733699584c051e570a43c Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Thu, 3 Feb 2022 16:22:00 +0100 Subject: noheat: Upgrades, refactor, deploy Devstack * Revert "Enable VID" (this reverts commit 2223bfaffa8fe5fb90c578ec71a035f001b9ce22) * make sure ca-certificates is current * add ability to configure Docker daemon * upgrade Ubuntu to 20.04 * update tools, dependencies, Ansible Galaxy collections, Docker, RKE, k8s & charts * make Prometheus & MetalLB optional * deploy Istio * use copy instead of ansible.posix.synchronize * Allow to set IP address pools in OpenStack * fix ansible-lint issues * split big tasks files into smaller ones * migrate to ansible-core * add 'make onap' task * add Devstack deployment * fix NFS exports * add Strimzi * install Docker on operator * override Nexus only on hosts that need it * ability to set override file (sm-onap is default) * ability to set ONAP (OOM) branch * ability to set Devstack version * add playbook to deploy everything * describe how to run playbooks * save operator0 access information * install Galaxy deps with dedicated module Issue-ID: INT-1601 Signed-off-by: Maciej Wereski Change-Id: I88cfeeaf281c175340b63909983251ecd62eeb00 --- .../noheat/infra-openstack/ansible/group_vars/all.yml | 1 - .../infra-openstack/ansible/group_vars/all.yml.sample | 16 +++++++++++++++- .../infra-openstack/ansible/group_vars/all.yml.sm-onap | 15 ++++++++++++++- .../infra-openstack/ansible/group_vars/all/all.yml | 1 + .../infra-openstack/ansible/group_vars/all/openstack.yml | 6 ++++++ 5 files changed, 36 insertions(+), 3 deletions(-) delete mode 120000 deployment/noheat/infra-openstack/ansible/group_vars/all.yml create mode 120000 deployment/noheat/infra-openstack/ansible/group_vars/all/all.yml create mode 100644 deployment/noheat/infra-openstack/ansible/group_vars/all/openstack.yml (limited to 'deployment/noheat/infra-openstack/ansible/group_vars') diff --git a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml deleted file mode 120000 index e4e1e1f50..000000000 --- a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml +++ /dev/null @@ -1 +0,0 @@ -all.yml.sample \ No newline at end of file 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 1b03b06d5..541e15279 100644 --- a/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample +++ b/deployment/noheat/infra-openstack/ansible/group_vars/all.yml.sample @@ -18,9 +18,23 @@ securitygroup: - "192.168.1.0/24" image: - name: &image_name "Ubuntu_18.04" + name: &image_name "Ubuntu_20.04" user: "ubuntu" +openstack: + name: "vnf0" + inventory: "~/inventory.ini" + hosts: + - name: "openstack0" + image: *image_name + flavor: "m1.large" + keypair: *keypair_name + network: *network_name + securitygroup: *securitygroup_name + boot_from_volume: true + terminate_volume: true + volume_size: 100 + operation: name: "operation0" inventory: "~/inventory.ini" 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 cb5168c26..9223ea591 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 @@ -14,9 +14,22 @@ securitygroup: - "192.168.1.0/24" image: - name: &image_name "Ubuntu_18.04" + name: &image_name "Ubuntu_20.04" user: "ubuntu" +openstack: + name: "vnf0" + inventory: "~/inventory.ini" + hosts: + - name: "openstack0" + image: *image_name + flavor: "m1.xlarge" + keypair: *keypair_name + network: *network_name + auto_ip: false + securitygroup: *securitygroup_name + volume_size: 140 + operation: name: "operation0" inventory: "~/inventory.ini" diff --git a/deployment/noheat/infra-openstack/ansible/group_vars/all/all.yml b/deployment/noheat/infra-openstack/ansible/group_vars/all/all.yml new file mode 120000 index 000000000..854839817 --- /dev/null +++ b/deployment/noheat/infra-openstack/ansible/group_vars/all/all.yml @@ -0,0 +1 @@ +../all.yml.sample \ No newline at end of file diff --git a/deployment/noheat/infra-openstack/ansible/group_vars/all/openstack.yml b/deployment/noheat/infra-openstack/ansible/group_vars/all/openstack.yml new file mode 100644 index 000000000..63ed1b081 --- /dev/null +++ b/deployment/noheat/infra-openstack/ansible/group_vars/all/openstack.yml @@ -0,0 +1,6 @@ +--- +openstack_username: "admin" +openstack_domain: "Default" +openstack_passwd: "secret" +openstack_region: "RegionOne" +openstack_tenant: "admin" -- cgit 1.2.3-korg