Merge "Script for full ONAP redeploy using existing k8s"

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 32fe3c3..3b97c5a 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -7,8 +7,8 @@ parameters:
 
   rancher_vm_flavor: m5.xlarge
   k8s_vm_flavor: m4.xlarge
-  etcd_vm_flavor: m1.medium
-  orch_vm_flavor: m1.medium
+  etcd_vm_flavor: m1.large
+  orch_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
 

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index feb0c36..cb42966 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -7,8 +7,8 @@ parameters:
 
   rancher_vm_flavor: m2.xlarge
   k8s_vm_flavor: m1.xlarge
-  etcd_vm_flavor: m1.medium
-  orch_vm_flavor: m1.medium
+  etcd_vm_flavor: m1.large
+  orch_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
 

diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 61ed8a5..dc06512 100644 (file)
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -219,7 +219,6 @@ resources:
               get_attr: [k8s_8_floating_ip, floating_ip_address],
               get_attr: [k8s_9_floating_ip, floating_ip_address],
               get_attr: [k8s_10_floating_ip, floating_ip_address],
-              get_attr: [k8s_11_floating_ip, floating_ip_address],
             ]
             __k8s_private_ips__: [
               get_attr: [k8s_1_floating_ip, fixed_ip_address],
@@ -232,7 +231,6 @@ resources:
               get_attr: [k8s_8_floating_ip, fixed_ip_address],
               get_attr: [k8s_9_floating_ip, fixed_ip_address],
               get_attr: [k8s_10_floating_ip, fixed_ip_address],
-              get_attr: [k8s_11_floating_ip, fixed_ip_address],
             ]
   k8s_1_private_port:
     type: OS::Neutron::Port
@@ -604,43 +602,6 @@ resources:
           template:
             get_file: k8s_vm_entrypoint.sh
 
-  k8s_11_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_network }
-      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  k8s_11_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: k8s_11_private_port }
-
-  k8s_11_vm:
-    type: OS::Nova::Server
-    properties:
-      name:
-        list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s', '11' ] ]
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: k8s_vm_flavor }
-      key_name: { get_param: key_name }
-      networks:
-      - port: { get_resource: k8s_11_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __docker_proxy__: { get_param: docker_proxy }
-            __apt_proxy__: { get_param: apt_proxy }
-            __docker_version__: { get_param: docker_version }
-            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
-            __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
-            __host_label__: 'compute'
-          template:
-            get_file: k8s_vm_entrypoint.sh
-
   etcd_1_private_port:
     type: OS::Neutron::Port
     properties:
@@ -789,43 +750,6 @@ resources:
           template:
             get_file: k8s_vm_entrypoint.sh
 
-  orch_2_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_network }
-      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  orch_2_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: orch_2_private_port }
-
-  orch_2_vm:
-    type: OS::Nova::Server
-    properties:
-      name:
-        list_join: ['-', [ { get_param: 'OS::stack_name' }, 'orch', '2' ] ]
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: orch_vm_flavor }
-      key_name: { get_param: key_name }
-      networks:
-      - port: { get_resource: orch_2_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __docker_proxy__: { get_param: docker_proxy }
-            __apt_proxy__: { get_param: apt_proxy }
-            __docker_version__: { get_param: docker_version }
-            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
-            __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
-            __host_label__: 'orchestration'
-          template:
-            get_file: k8s_vm_entrypoint.sh
-
 outputs:
   rancher_vm_ip:
     description: The IP address of the rancher instance
@@ -871,7 +795,3 @@ outputs:
     description: The IP address of the k8s_10 instance
     value: { get_attr: [k8s_10_floating_ip, floating_ip_address] }
 
-  k8s_11_vm_ip:
-    description: The IP address of the k8s_11 instance
-    value: { get_attr: [k8s_11_floating_ip, floating_ip_address] }
-

diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
index 0afd480..5700111 100755 (executable)
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -101,7 +101,7 @@ for VM_NUM in $(seq 3); do
     VM_TYPE=etcd HOST_LABEL=etcd VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
 done
 
-for VM_NUM in $(seq 2); do
+for VM_NUM in $(seq 1); do
     VM_TYPE=orch HOST_LABEL=orchestration VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
 done
 

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 4beeecf..8efb6cc 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -11,8 +11,8 @@ onap/aaf/aaf_oauth,2.1.6-SNAPSHOT
 onap/aaf/aaf_service,2.1.6-SNAPSHOT
 onap/aaf/abrmd,3.0.0-SNAPSHOT-latest
 onap/aaf/distcenter,3.0.0-SNAPSHOT-latest
-onap/aaf/sms,3.0.0-SNAPSHOT-latest
-onap/aaf/smsquorumclient,3.0.0-SNAPSHOT-latest
+onap/aaf/sms,3.0.1-SNAPSHOT-latest
+onap/aaf/smsquorumclient,3.0.1-SNAPSHOT-latest
 onap/aaf/testcaservice,3.0.0-SNAPSHOT-latest
 onap/aai-graphadmin,1.0-STAGING-latest
 onap/aai-resources,1.3-STAGING-latest

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 775e4fb..d5b7c1a 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -10,8 +10,8 @@ onap/aaf/aaf_oauth,2.1.6
 onap/aaf/aaf_service,2.1.6
 onap/aaf/abrmd,3.0.0
 onap/aaf/distcenter,3.0.0
-onap/aaf/sms,3.0.0
-onap/aaf/smsquorumclient,3.0.0
+onap/aaf/sms,3.0.1
+onap/aaf/smsquorumclient,3.0.1
 onap/aaf/testcaservice,3.0.0
 onap/aai-cacher,1.0.0
 onap/aai-graphadmin,1.0.0
@@ -67,7 +67,7 @@ onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
 onap/org.onap.dcaegen2.deployments.cm-container,1.4.2
 onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.2
-onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.4
+onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.5
 onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
 onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
 onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0