diff options
Diffstat (limited to 'heat/ONAP/onap_openstack.yaml')
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 375 |
1 files changed, 319 insertions, 56 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 5e925a64..e9866536 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -99,7 +99,7 @@ parameters: nexus_password: type: string - description: Nexus Repository Password + description: Nexus Repository password artifacts_version: type: string @@ -207,7 +207,7 @@ parameters: type: string clamp_ip_addr: type: string - openo_ip_addr: + multiserv_ip_addr: type: string music_ip_addr: type: string @@ -661,6 +661,16 @@ resources: echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt echo "__openstack_region__" > /opt/config/openstack_region.txt + # Add host name to /etc/host to avoid warnings in openstack images + if [[ "__cloud_env__" != "rackspace" ]] + then + echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh + fi + if [ __http_proxy__ != "no_proxy" ] then echo "Acquire" > /etc/apt/apt.conf.d/apt.conf @@ -674,15 +684,61 @@ resources: export https_proxy=__https_proxy__ fi - # Download and run install script apt update - apt-get -y install unzip + apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-transport-https ca-certificates wget git ntp ntpdate make jq unzip + + # Download boot scripts if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi - while [ ! -s /opt/boot-__artifacts_version__.zip ]; do - curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip + cd /opt + while [ -z "$ZIP_NAME" ] || [ ! -s "$ZIP_NAME" ]; do + wget --content-disposition "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" + ZIP_NAME=$(ls -1 /opt/boot-*.zip) done - ln -s /opt/boot-__artifacts_version__.zip /opt/boot.zip + mkdir -p /opt/boot + unzip $ZIP_NAME -d /opt/boot + + # Enable autorestart when VM reboots + update-rc.d serv.sh defaults + + # Download and install docker-engine + echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list + apt-get update + apt-get install -y --allow-unauthenticated docker-engine + + # Install docker-compose + mkdir -p /opt/docker + curl -L "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-$(uname -s)-$(uname -m)" > /opt/docker/docker-compose + chmod +x /opt/docker/docker-compose + # Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP + DNS_FLAG="" + if [ -s /opt/config/dns_ip_addr.txt ] + then + DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) " + fi + if [ -s /opt/config/external_dns.txt ] + then + DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) " + fi + MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) + echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker + + cp /lib/systemd/system/docker.service /etc/systemd/system + sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service + if [ __http_proxy__ != "no_proxy" ] + then + echo "[Service]" > /etc/systemd/system/docker.service.d/http-proxy.conf + echo "Environment=\"http_proxy=http://__http_proxy__" >> /etc/systemd/system/docker.service.d/http-proxy.conf + echo "Environment=\"https_proxy=https://__https_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf + echo "Environment=\"HTTP_PROXY=HTTP://__http_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf + echo "Environment=\"HTTPS_PROXY=HTTPS://__https_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf + fi + systemctl daemon-reload + service docker restart + + # DNS IP address configuration + echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head + resolvconf -u # DNS Server instantiation dns_private_port: @@ -747,7 +803,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __music_ip_addr__: { get_param: music_ip_addr } __oof_ip_addr__: { get_param: oof_ip_addr } __aaf_ip_addr__: { get_param: aaf_ip_addr } @@ -772,7 +828,7 @@ resources: echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt @@ -824,6 +880,17 @@ resources: - path: /opt/aai_install.sh permissions: '0755' content: { get_file: cloud-config/aai_install.sh } + - path: /opt/aai_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/aai_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: aai_vm_init.sh + template: + get_file: cloud-config/serv.sh aai1_vm_config: type: OS::Heat::MultipartMime @@ -890,6 +957,17 @@ resources: - path: /opt/aai_install.sh permissions: '0755' content: { get_file: cloud-config/aai_install.sh } + - path: /opt/aai_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/aai_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: aai_vm_init.sh + template: + get_file: cloud-config/serv.sh aai2_vm_config: type: OS::Heat::MultipartMime @@ -957,6 +1035,17 @@ resources: - path: /opt/so_install.sh permissions: '0755' content: { get_file: cloud-config/so_install.sh } + - path: /opt/so_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/so_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: so_vm_init.sh + template: + get_file: cloud-config/serv.sh so_vm_config: type: OS::Heat::MultipartMime @@ -969,7 +1058,6 @@ resources: params: __keystone_url__: { get_param: keystone_url } __dmaap_topic__: { get_param: dmaap_topic } - __openo_ip__: { get_param: openo_ip_addr } __docker_version__: { get_param: so_docker } __gerrit_branch__: { get_param: so_branch } __so_repo__: { get_param: so_repo } @@ -977,7 +1065,6 @@ resources: #!/bin/bash # Create configuration files - echo "__openo_ip__" > /opt/config/openo_ip.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt ln -s /opt/config/openstack_tenant_id.txt /opt/config/tenant_id.txt echo "__keystone_url__" > /opt/config/keystone.txt @@ -1028,6 +1115,20 @@ resources: - path: /opt/mr_install.sh permissions: '0755' content: { get_file: cloud-config/mr_install.sh } + - path: /opt/mr_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/mr_vm_init.sh } + - path: /opt/dbcl_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/dbcl_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: mr_vm_init.sh + template: + get_file: cloud-config/serv.sh mrouter_vm_config: type: OS::Heat::MultipartMime @@ -1092,6 +1193,17 @@ resources: - path: /opt/robot_install.sh permissions: '0755' content: { get_file: cloud-config/robot_install.sh } + - path: /opt/robot_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/robot_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: robot_vm_init.sh + template: + get_file: cloud-config/serv.sh robot_vm_config: type: OS::Heat::MultipartMime @@ -1120,7 +1232,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __music_ip_addr__: { get_param: music_ip_addr } __oof_ip_addr__: { get_param: oof_ip_addr } __aaf_ip_addr__: { get_param: aaf_ip_addr } @@ -1164,8 +1276,10 @@ resources: echo "__sdnc_ip_addr__" > /opt/config/sdnc_portal_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt + ln -s /opt/config/msb_ip_addr.txt /opt/config/openo_ip_addr.txt # need this temporarily until testsuite docker image is released + echo "__multiserv_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt echo "__oof_ip_addr__" > /opt/config/oof_homing_ip_addr.txt @@ -1232,6 +1346,17 @@ resources: - path: /opt/vid_install.sh permissions: '0755' content: { get_file: cloud-config/vid_install.sh } + - path: /opt/vid_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/vid_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: vid_vm_init.sh + template: + get_file: cloud-config/serv.sh vid_vm_config: type: OS::Heat::MultipartMime @@ -1296,6 +1421,17 @@ resources: - path: /opt/sdnc_install.sh permissions: '0755' content: { get_file: cloud-config/sdnc_install.sh } + - path: /opt/sdnc_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/sdnc_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: sdnc_vm_init.sh + template: + get_file: cloud-config/serv.sh sdnc_vm_config: type: OS::Heat::MultipartMime @@ -1371,6 +1507,20 @@ resources: - path: /opt/sdc_install.sh permissions: '0755' content: { get_file: cloud-config/sdc_install.sh } + - path: /opt/sdc_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/sdc_vm_init.sh } + - path: /opt/sdc_wfd_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/sdc_wfd_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: sdc_vm_init.sh + template: + get_file: cloud-config/serv.sh sdc_vm_config: type: OS::Heat::MultipartMime @@ -1443,6 +1593,17 @@ resources: - path: /opt/portal_install.sh permissions: '0755' content: { get_file: cloud-config/portal_install.sh } + - path: /opt/portal_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/portal_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: portal_vm_init.sh + template: + get_file: cloud-config/serv.sh portal_vm_config: type: OS::Heat::MultipartMime @@ -1511,6 +1672,17 @@ resources: - path: /opt/policy_install.sh permissions: '0755' content: { get_file: cloud-config/policy_install.sh } + - path: /opt/policy_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/policy_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: policy_vm_init.sh + template: + get_file: cloud-config/serv.sh policy_vm_config: type: OS::Heat::MultipartMime @@ -1577,6 +1749,17 @@ resources: - path: /opt/appc_install.sh permissions: '0755' content: { get_file: cloud-config/appc_install.sh } + - path: /opt/appc_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/appc_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: appc_vm_init.sh + template: + get_file: cloud-config/serv.sh appc_vm_config: type: OS::Heat::MultipartMime @@ -1645,6 +1828,17 @@ resources: - path: /opt/clamp_install.sh permissions: '0755' content: { get_file: cloud-config/clamp_install.sh } + - path: /opt/clamp_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/clamp_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: clamp_vm_init.sh + template: + get_file: cloud-config/serv.sh clamp_vm_config: type: OS::Heat::MultipartMime @@ -1675,22 +1869,22 @@ resources: ./clamp_install.sh - # OPEN-O VM instantiation - openo_private_port: + # MultiService VM instantiation + multiserv_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } - fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: multiserv_ip_addr }}] security_groups: - { get_resource: onap_sg } - openo_floating_ip: + multiserv_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: openo_private_port } + port_id: { get_resource: multiserv_private_port } - openo_vm: + multiserv_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } @@ -1702,25 +1896,36 @@ resources: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: openo_private_port } + - port: { get_resource: multiserv_private_port } user_data_format: SOFTWARE_CONFIG - user_data: { get_resource: openo_vm_config } + user_data: { get_resource: multiserv_vm_config } - openo_vm_scripts: + multiserv_vm_scripts: type: OS::Heat::CloudConfig properties: cloud_config: write_files: - - path: /opt/openo_install.sh + - path: /opt/multiserv_install.sh permissions: '0755' - content: { get_file: cloud-config/openo_install.sh } - - openo_vm_config: + content: { get_file: cloud-config/multiserv_install.sh } + - path: /opt/cli_install.sh + permissions: '0755' + content: { get_file: cloud-config/cli_install.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: multiserv_all_serv.sh + template: + get_file: cloud-config/serv.sh + + multiserv_vm_config: type: OS::Heat::MultipartMime properties: parts: - config: { get_resource: common_config_script } - - config: { get_resource: openo_vm_scripts } + - config: { get_resource: multiserv_vm_scripts } - config: str_replace: params: @@ -1738,7 +1943,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __clamp_ip_addr__: { get_param: clamp_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __vnfsdk_branch__: { get_param: vnfsdk_branch } __msb_docker__: { get_param: msb_docker } __mvim_docker__: { get_param: mvim_docker } @@ -1808,14 +2013,14 @@ resources: echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt - echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MULTISERV_IP=__multiserv_ip_addr__" >> /opt/config/onap_ips.txt cd /opt - ./openo_install.sh + ./multiserv_install.sh # DCAE GEN 2 Controller instantiation - dcae_c_private_port: + dcae_private_port: type: OS::Neutron::Port properties: network: { get_resource: oam_onap } @@ -1823,13 +2028,13 @@ resources: security_groups: - { get_resource: onap_sg } - dcae_c_floating_ip: + dcae_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: dcae_c_private_port } + port_id: { get_resource: dcae_private_port } - dcae_c_vm: + dcae_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } @@ -1841,13 +2046,11 @@ resources: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: dcae_c_private_port } - #security_groups: - # - { get_resource: onap_sg } + - port: { get_resource: dcae_private_port } user_data_format: SOFTWARE_CONFIG - user_data: { get_resource: dcae_c_vm_config } + user_data: { get_resource: dcae_vm_config } - dcae_c_vm_scripts: + dcae_vm_scripts: type: OS::Heat::CloudConfig properties: cloud_config: @@ -1855,13 +2058,21 @@ resources: - path: /opt/dcae2_install.sh permissions: '0755' content: { get_file: cloud-config/dcae2_install.sh } - - dcae_c_vm_config: + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: dcae2_vm_init.sh + template: + get_file: cloud-config/serv.sh + + dcae_vm_config: type: OS::Heat::MultipartMime properties: parts: - config: { get_resource: common_config_script } - - config: { get_resource: dcae_c_vm_scripts } + - config: { get_resource: dcae_vm_scripts } - config: str_replace: params: @@ -1870,9 +2081,9 @@ resources: __docker_version__: { get_param: dcae_docker } # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs __dcae_deployment_profile__: { get_param: dcae_deployment_profile } - __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] } + __mac_addr__: { get_attr: [dcae_private_port, mac_address] } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __dcae_float_ip__: { get_attr: [dcae_floating_ip, floating_ip_address] } __dns_forwarder__: { get_param: dns_forwarder } __dcae_domain__: { get_param: dcae_domain } # conf for VMs DCAE is to bringup @@ -1888,7 +2099,6 @@ resources: template: 'onap_sg_rand' params: rand: { get_resource: random-str } - #__dcaeos_security_group__: { get_attr: [onap_sg, name] } __dcaeos_username__: { get_param: openstack_username } __dcaeos_password__: { get_param: openstack_api_key } __dcaeos_key_name__: { get_resource: vm_key } @@ -1910,7 +2120,7 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } - __openo_ip_addr__: { get_param: openo_ip_addr } + __multiserv_ip_addr__: { get_param: multiserv_ip_addr } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } # floating IPs @@ -1920,8 +2130,8 @@ resources: __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] } __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] } __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] } - __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] } - __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] } + __multiserv_floating_ip_addr__: { get_attr: [multiserv_floating_ip, floating_ip_address] } + __dcae_floating_ip_addr__: { get_attr: [dcae_floating_ip, floating_ip_address] } # container versions __dcae_docker__: { get_param: dcae_docker } __dcae_snmptrap_docker__: { get_param: dcae_snmptrap_docker } @@ -1942,7 +2152,6 @@ resources: __holmes_em_docker__: { get_param: holmes_em_docker } __holmes_rm_docker__: { get_param: holmes_rm_docker } - template: | #!/bin/bash @@ -1956,7 +2165,6 @@ resources: echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt echo "__mac_addr__" > /opt/config/mac_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt echo "__dcae_domain__" > /opt/config/dcae_domain.txt # conf for the OpenStack env where DCAE is deployed @@ -1989,8 +2197,8 @@ resources: echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt - echo "__openo_ip_addr__" > /opt/config/msb_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt + echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt # floating IPs @@ -2000,8 +2208,8 @@ resources: echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt - echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt - echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt + echo "__multiserv_floating_ip_addr__" > /opt/config/multiserv_floating_ip_addr.txt + echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt # container versions echo "__dcae_docker__" > /opt/config/dcae_docker.txt echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt @@ -2023,7 +2231,7 @@ resources: echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt cd /opt - ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1 + ./dcae2_install.sh 2>&1 | tee -a /tmp/dcae2_install.log # MUSIC instantiation @@ -2065,6 +2273,17 @@ resources: - path: /opt/music_install.sh permissions: '0755' content: { get_file: cloud-config/music_install.sh } + - path: /opt/music_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/music_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: music_vm_init.sh + template: + get_file: cloud-config/serv.sh music_vm_config: type: OS::Heat::MultipartMime @@ -2129,6 +2348,17 @@ resources: - path: /opt/oof_install.sh permissions: '0755' content: { get_file: cloud-config/oof_install.sh } + - path: /opt/oof_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/oof_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: oof_vm_init.sh + template: + get_file: cloud-config/serv.sh oof_vm_config: type: OS::Heat::MultipartMime @@ -2199,6 +2429,17 @@ resources: - path: /opt/aaf_install.sh permissions: '0755' content: { get_file: cloud-config/aaf_install.sh } + - path: /opt/aaf_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/aaf_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: aaf_vm_init.sh + template: + get_file: cloud-config/serv.sh aaf_vm_config: type: OS::Heat::MultipartMime @@ -2265,6 +2506,17 @@ resources: - path: /opt/sms_install.sh permissions: '0755' content: { get_file: cloud-config/sms_install.sh } + - path: /opt/sms_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/sms_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: sms_vm_init.sh + template: + get_file: cloud-config/serv.sh sms_vm_config: type: OS::Heat::MultipartMime @@ -2331,6 +2583,17 @@ resources: - path: /opt/nbi_install.sh permissions: '0755' content: { get_file: cloud-config/nbi_install.sh } + - path: /opt/nbi_vm_init.sh + permissions: '0755' + content: { get_file: cloud-config/nbi_vm_init.sh } + - path: /etc/init.d/serv.sh + permissions: '0755' + content: + str_replace: + params: + __vm_init_script__: nbi_vm_init.sh + template: + get_file: cloud-config/serv.sh nbi_vm_config: type: OS::Heat::MultipartMime |