install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
+install config/deploy/os-odl_l2-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml
install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
parameters:
controllerImage: overcloud-full
- OvercloudControlFlavor: baremetal
+ OvercloudControlFlavor: control
+ OvercloudComputeFlavor: compute
ControllerEnableSwiftStorage: false
+# CloudDomain:
EnableSahara: false
ExtraConfig:
tripleo::ringbuilder::build_ring: False
gpgcheck=0
EOF
+# SDNVPN - Copy tunnel setup script
+wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
+
# install ODL packages
# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
--install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
--run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
--run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
+ --upload ./setup_TEPs.py:/tmp \
-a overcloud-full-opendaylight_build.qcow2
# Move these two lines above the -a overcloud-full-opendaylight_build.qcow2 when the patch has been rebased
38,Fixes nova default floating pool to be 'external'
39,removing extra whitespace from congress parameter
40,Move mongo to step 1
+42, congress typo
--- /dev/null
+global_params:
+ ha_enabled: true
+
+deploy_options:
+ sdn_controller: opendaylight
+ sdn_l3: false
+ tacker: false
+ congress: false
+ sfc: false
+ vpn: true
# DNS Servers for all nodes, comma delimited list
dns_servers: ["8.8.8.8", "8.8.4.4"]
+# Domain name to use for undercloud/overcloud nodes
+domain_name: 'opnfvapex.com'
+
# "admin" is the short name for Control Plane Network.
# During OPNFV deployment it is used for node provisioning so
# PXE boot should be enabled for the related interfaces on all
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml"
+ elif [ "${deploy_options_array['vpn']}" == 'true' ]; then
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
else
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
fi
DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
fi
- if [[ ! "$virtual" == "TRUE" ]]; then
- DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
- else
+ DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
+ if [[ "$virtual" == "TRUE" ]]; then
DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
fi
dns_server_ext="\${dns_server_ext} --dns-nameserver \${dns_server}"
done
neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext}
+sed -i '/CloudDomain:/c\ CloudDomain: '${domain_name} opnfv-environment.yaml
echo "Executing overcloud deployment, this should run for an extended period without output."
sleep 60 #wait for Hypervisor stats to check-in to nova
# save deploy command so it can be used for debugging
# TODO fix this when HA SDN controllers are supported
if [ "${deploy_options_array['sdn_controller']}" != 'False' ]; then
echo -e "${blue}INFO: Finding SDN Controller IP for overcloudrc...${reset}"
- sdn_controller_ip=$(overcloud_connect controller0 "facter ipaddress_br_ex")
+ sdn_controller_ip=$(undercloud_connect stack "source stackrc;nova list | grep controller-0 | cut -d '|' -f 7 | grep -Eo [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
echo -e "${blue}INFO: SDN Controller IP is ${sdn_controller_ip} ${reset}"
undercloud_connect stack "echo 'export SDN_CONTROLLER_IP=${sdn_controller_ip}' >> /home/stack/overcloudrc"
fi
STORAGE_NETWORK, API_NETWORK]
DNS_SERVERS = ["8.8.8.8", "8.8.4.4"]
ROLES = ['compute', 'controller']
+DOMAIN_NAME = 'localdomain.com'
self.settings_obj['dns_servers'] = self.settings_obj.get(
'dns_servers', constants.DNS_SERVERS)
+ self.settings_obj['domain_name'] = self.settings_obj.get(
+ 'domain_name', constants.DOMAIN_NAME)
def _validate_overcloud_nic_order(self, network):
"""
dns_list = dns_list + "{} ".format(dns_server)
dns_list = dns_list.strip()
bash_str += "dns_servers=\'{}\'\n".format(dns_list)
+ bash_str += "domain_name=\'{}\'\n".format(self.settings_obj[
+ 'domain_name'])
if path:
with open(path, 'w') as file:
file.write(bash_str)
openstack-config --set undercloud.conf DEFAULT dhcp_end ${admin_network_dhcp_range##*,}
openstack-config --set undercloud.conf DEFAULT inspection_iprange ${admin_network_introspection_range}
openstack-config --set undercloud.conf DEFAULT undercloud_debug false
+ openstack-config --set undercloud.conf DEFAULT undercloud_hostname "undercloud.${domain_name}"
fi
sleep 30
sudo systemctl restart openstack-glance-api
+# Set nova domain name
+sudo openstack-config --set /etc/nova/nova.conf DEFAULT dns_domain ${domain_name}
+sudo openstack-config --set /etc/nova/nova.conf DEFAULT dhcp_domain ${domain_name}
sudo systemctl restart openstack-nova-conductor
sudo systemctl restart openstack-nova-compute
+sudo systemctl restart openstack-nova-api
+sudo systemctl restart openstack-nova-scheduler
+
+# Set neutron domain name
+sudo openstack-config --set /etc/neutron/neutron.conf DEFAULT dns_domain ${domain_name}
+sudo systemctl restart neutron-server
+sudo systemctl restart neutron-dhcp-agent
sudo sed -i '/num_engine_workers/c\num_engine_workers = 2' /etc/heat/heat.conf
sudo sed -i '/#workers\s=/c\workers = 2' /etc/heat/heat.conf