diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-12-15 10:52:27 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-12-15 10:57:28 -0500 |
| commit | cefc023878371c46ec2cd3e0176c3f25c28c1906 (patch) | |
| tree | 5fd0a6949021ef87e685ca930850f2a1e02a1c33 | |
| parent | c2ceba8a6e2092866a6457a3517964fd4822fb21 (diff) | |
fixing disabling l3 HA neutron option and removing duplicate ntp option
Change-Id: I6e3a4266be28b0f661e4b8e818c616000060905b
| -rw-r--r-- | build/opendaylight-tripleo-heat-templates.patch | 10 | ||||
| -rwxr-xr-x | ci/deploy.sh | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/build/opendaylight-tripleo-heat-templates.patch b/build/opendaylight-tripleo-heat-templates.patch index 2a7176e4..c75be102 100644 --- a/build/opendaylight-tripleo-heat-templates.patch +++ b/build/opendaylight-tripleo-heat-templates.patch @@ -1,4 +1,4 @@ -From bdda149ddf16b5818882993d9df1e66a2d61a383 Mon Sep 17 00:00:00 2001 +From 187401f1be6b4a85c032d66d3d436683fbd2514c Mon Sep 17 00:00:00 2001 From: Dan Radez <dradez@redhat.com> Date: Sun, 13 Dec 2015 21:20:40 -0500 Subject: [PATCH] Adds OpenDaylight support @@ -27,7 +27,7 @@ environments/opendaylight-external.yaml diff --git a/environments/opendaylight-external.yaml b/environments/opendaylight-external.yaml new file mode 100644 -index 0000000..46505b4 +index 0000000..bbc78db --- /dev/null +++ b/environments/opendaylight-external.yaml @@ -0,0 +1,21 @@ @@ -48,13 +48,13 @@ index 0000000..46505b4 +parameters: + # increase this if you need more ODL nodes + # OpenDaylightCount: 1 ++ NeutronL3HA: false + ExtraConfig: + neutron_mechanism_drivers: ['opendaylight'] + neutron_tenant_network_type: vxlan -+ neutron_l3_ha: false diff --git a/environments/opendaylight.yaml b/environments/opendaylight.yaml new file mode 100644 -index 0000000..07e80ab +index 0000000..b9ffeb9 --- /dev/null +++ b/environments/opendaylight.yaml @@ -0,0 +1,18 @@ @@ -71,11 +71,11 @@ index 0000000..07e80ab +parameters: + # instructs there not to be any ODL only nodes + OpenDaylightCount: 0 ++ NeutronL3HA: false + ExtraConfig: + neutron_mechanism_drivers: ['opendaylight'] + neutron_tenant_network_type: vxlan + opendaylight_install: true -+ neutron_l3_ha: false diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 4cfed6b..adecc79 100644 --- a/overcloud-resource-registry-puppet.yaml diff --git a/ci/deploy.sh b/ci/deploy.sh index 1c0d012c..88a6a9b1 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -470,15 +470,17 @@ function undercloud_prep_overcloud_deploy { ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "openstack undercloud install > apex-undercloud-install.log" # check if HA is enabled - if [ $ha_enabled == "TRUE" ]; then + if [[ "$ha_enabled" == "TRUE" ]]; then DEPLOY_OPTIONS+=" --control-scale 3 --compute-scale 2" DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml" - DEPLOY_OPTIONS+=" --ntp-server $ntp_server" fi - if [ $net_isolation_enabled == "TRUE" ]; then + if [[ "$net_isolation_enabled" == "TRUE" ]]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml" DEPLOY_OPTIONS+=" -e network-environment.yaml" + fi + + if [[ "$ha_enabled" == "TRUE" ]] || [[ $net_isolation_enabled == "TRUE" ]]; then DEPLOY_OPTIONS+=" --ntp-server $ntp_server" fi |