diff options
Diffstat (limited to 'kud')
| -rw-r--r-- | kud/deployment_infra/playbooks/configure-virtlet.yml | 2 | ||||
| -rw-r--r-- | kud/hosting_providers/vagrant/Vagrantfile | 8 | ||||
| -rw-r--r-- | kud/hosting_providers/vagrant/config/default.yml | 2 | ||||
| -rw-r--r-- | kud/hosting_providers/vagrant/config/samples/pdf.yml.aio | 2 | ||||
| -rwxr-xr-x | kud/tests/plugin_collection_v2.sh | 11 |
5 files changed, 13 insertions, 12 deletions
diff --git a/kud/deployment_infra/playbooks/configure-virtlet.yml b/kud/deployment_infra/playbooks/configure-virtlet.yml index 9874eb8f..d2461f73 100644 --- a/kud/deployment_infra/playbooks/configure-virtlet.yml +++ b/kud/deployment_infra/playbooks/configure-virtlet.yml @@ -40,7 +40,7 @@ - regexp: 'centos/(\d+)-(\d+)' url: 'https://cloud.centos.org/centos/$1/images/CentOS-$1-x86_64-GenericCloud-$2.qcow2' - name: fedora - url: https://dl.fedoraproject.org/pub/fedora/linux/releases/29/Cloud/x86_64/images/Fedora-Cloud-Base-29-1.2.x86_64.qcow2 + url: https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2 {% if lookup('env','http_proxy') != "" %} transports: "": diff --git a/kud/hosting_providers/vagrant/Vagrantfile b/kud/hosting_providers/vagrant/Vagrantfile index 2d1b5ab4..eb5e5cdc 100644 --- a/kud/hosting_providers/vagrant/Vagrantfile +++ b/kud/hosting_providers/vagrant/Vagrantfile @@ -10,8 +10,8 @@ ############################################################################## box = { - :virtualbox => { :name => 'elastic/ubuntu-16.04-x86_64', :version => '20180708.0.0' }, - :libvirt => { :name => 'elastic/ubuntu-16.04-x86_64', :version=> '20180210.0.0'} + :virtualbox => { :name => 'elastic/ubuntu-18.04-x86_64', :version => '20191013.0.0'}, + :libvirt => { :name => 'intergratedcloudnative/ubuntu1804', :version => '1.0.0'} } require 'yaml' @@ -122,8 +122,8 @@ Vagrant.configure("2") do |config| installer.vm.provision 'shell', privileged: false do |sh| sh.env = {'KUD_PLUGIN_ENABLED': 'false', 'OVN_CENTRAL_INTERFACE': 'eth1'} sh.inline = <<-SHELL - cp /vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub - cp /vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa + cp /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/insecure_keys/key.pub /home/vagrant/.ssh/id_rsa.pub + cp /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/insecure_keys/key /home/vagrant/.ssh/id_rsa chown vagrant /home/vagrant/.ssh/id_rsa chmod 400 /home/vagrant/.ssh/id_rsa cd /home/vagrant/multicloud-k8s/kud/hosting_providers/vagrant/ && ./installer.sh | tee kud_installer.log diff --git a/kud/hosting_providers/vagrant/config/default.yml b/kud/hosting_providers/vagrant/config/default.yml index 10b93663..094c3594 100644 --- a/kud/hosting_providers/vagrant/config/default.yml +++ b/kud/hosting_providers/vagrant/config/default.yml @@ -37,7 +37,7 @@ memory: 32768 cpus: 16 volumes: - - name: sda + - name: sdb size: 50 mount: /var/lib/docker/ roles: diff --git a/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio index 48a3c938..a87f967e 100644 --- a/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio +++ b/kud/hosting_providers/vagrant/config/samples/pdf.yml.aio @@ -13,7 +13,7 @@ memory: 32768 cpus: 16 volumes: - - name: sda + - name: sdb size: 50 mount: /var/lib/docker/ roles: diff --git a/kud/tests/plugin_collection_v2.sh b/kud/tests/plugin_collection_v2.sh index 3351d8fc..09dec5c4 100755 --- a/kud/tests/plugin_collection_v2.sh +++ b/kud/tests/plugin_collection_v2.sh @@ -42,7 +42,7 @@ project_description="test_project_description" userData1="user1" userData2="user2" -composite_app_name="test_composite_app" +composite_app_name="test_composite_app_collection" composite_app_description="test_project_description" composite_app_version="test_composite_app_version" app1_helm_path="$CSAR_DIR/$csar_id/collectd.tar.gz" @@ -58,7 +58,8 @@ app2_desc="prometheus_desc" main_composite_profile_name="main_composite_profile" sub_composite_profile_name1="test_composite_profile1" sub_composite_profile_name2="test_composite_profile2" -composite_profile_description="test_composite_profile_description" +main_composite_profile_description="main_composite_profile_description" +sub_composite_profile_description="sub_composite_profile_description" genericPlacementIntentName="test_gen_placement_intent1" genericPlacementIntentDesc="test_gen_placement_intent_desc" @@ -175,7 +176,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${main_composite_profile_name}", - "description":"${composite_profile_description}", + "description":"${main_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" } @@ -192,7 +193,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${sub_composite_profile_name1}", - "description":"${composite_profile_description}", + "description":"${sub_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" }, @@ -212,7 +213,7 @@ payload="$(cat <<EOF { "metadata":{ "name":"${sub_composite_profile_name2}", - "description":"${composite_profile_description}", + "description":"${sub_composite_profile_description}", "userData1":"${userData1}", "userData2":"${userData2}" }, |