diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 445efdc19..940de8bba 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -21,6 +21,17 @@ EOF echo '[DEFAULT]' > ~/undercloud.conf echo "hieradata_override = $HOME/undercloud-hieradata-override.yaml" >> ~/undercloud.conf +cat <>~/undercloud.conf +network_cidr = 192.168.24.0/24 +local_ip = 192.168.24.1/24 +network_gateway = 192.168.24.1 +undercloud_public_vip = 192.168.24.2 +undercloud_admin_vip = 192.168.24.3 +masquerade_network = 192.168.24.0/24 +dhcp_start = 192.168.24.5 +dhcp_end = 192.168.24.30 +inspection_iprange = 192.168.24.100,192.168.24.120 +EOF if [ $UNDERCLOUD_SSL == 1 ] ; then echo 'generate_service_certificate = True' >> ~/undercloud.conf diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh index d9ccda4d6..2201ccb7c 100755 --- a/scripts/tripleo.sh +++ b/scripts/tripleo.sh @@ -719,6 +719,10 @@ function overcloud_pingtest { log "Overcloud pingtest" exitval=0 + stackrc_check + CTLPLANE_CIDR=$(neutron net-list -c subnets -c name -f value | grep ctlplane | awk {'print $2'}) + CTLPLANE_NET=$(echo $CTLPLANE_CIDR | awk -F "." {'print $1"."$2"."$3'}) + overcloudrc_check cleanup_pingtest @@ -743,10 +747,11 @@ function overcloud_pingtest { log "Overcloud pingtest, creating external network" neutron net-create nova --shared --router:external=True --provider:network_type flat \ --provider:physical_network datacentre - FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-"192.0.2.0/24"} - FLOATING_IP_START=${FLOATING_IP_START:-"192.0.2.50"} - FLOATING_IP_END=${FLOATING_IP_END:-"192.0.2.64"} - EXTERNAL_NETWORK_GATEWAY=${EXTERNAL_NETWORK_GATEWAY:-"192.0.2.1"} + + FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-$CTLPLANE_CIDR} + FLOATING_IP_START=${FLOATING_IP_START:-"${CTLPLANE_NET}.50"} + FLOATING_IP_END=${FLOATING_IP_END:-"${CTLPLANE_NET}.64"} + EXTERNAL_NETWORK_GATEWAY=${EXTERNAL_NETWORK_GATEWAY:-"${CTLPLANE_NET}.1"} TENANT_STACK_DEPLOY_ARGS=${TENANT_STACK_DEPLOY_ARGS:-""} neutron subnet-create --name ext-subnet --allocation-pool start=$FLOATING_IP_START,end=$FLOATING_IP_END --disable-dhcp --gateway $EXTERNAL_NETWORK_GATEWAY nova $FLOATING_IP_CIDR TENANT_PINGTEST_TEMPLATE=/usr/share/tripleo-ci/$PINGTEST_TEMPLATE.yaml @@ -820,16 +825,20 @@ function tempest_run { log "Running tempest" + stackrc_check + CTLPLANE_CIDR=$(neutron net-list -c subnets -c name -f value | grep ctlplane | awk {'print $2'}) + CTLPLANE_NET=$(echo $CTLPLANE_CIDR | awk -F "." {'print $1"."$2"."$3'}) + overcloudrc_check clean_tempest root_dir=$(realpath $(dirname ${BASH_SOURCE[0]:-$0})) [[ ! -e $HOME/tempest ]] && git clone https://github.com/openstack/tempest $HOME/tempest pushd $HOME/tempest git checkout $TEMPEST_PINNED - FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-"192.0.2.0/24"}; - FLOATING_IP_START=${FLOATING_IP_START:-"192.0.2.50"}; - FLOATING_IP_END=${FLOATING_IP_END:-"192.0.2.64"}; - export EXTERNAL_NETWORK_GATEWAY=${EXTERNAL_NETWORK_GATEWAY:-"192.0.2.1"}; + FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-$CTLPLANE_CIDR} + FLOATING_IP_START=${FLOATING_IP_START:-"${CTLPLANE_NET}.50"} + FLOATING_IP_END=${FLOATING_IP_END:-"${CTLPLANE_NET}.64"} + export EXTERNAL_NETWORK_GATEWAY=${EXTERNAL_NETWORK_GATEWAY:-"${CTLPLANE_NET}.1"} neutron net-create nova --shared --router:external=True --provider:network_type flat --provider:physical_network datacentre; neutron subnet-create --name ext-subnet --allocation-pool start=$FLOATING_IP_START,end=$FLOATING_IP_END --disable-dhcp --gateway $EXTERNAL_NETWORK_GATEWAY nova $FLOATING_IP_CIDR; sudo yum install -y libffi-devel openssl-devel python-virtualenv @@ -931,7 +940,7 @@ function multinode_setup { fi set +u log "Running ovs_vxlan_bridge" - ovs_vxlan_bridge $PUB_BRIDGE_NAME $primary_node "True" 2 192.0.2 24 $sub_nodes + ovs_vxlan_bridge $PUB_BRIDGE_NAME $primary_node "True" 2 192.168.24 24 $sub_nodes set -u log "Setting $PUB_BRIDGE_NAME up on $primary_node" @@ -947,7 +956,7 @@ function multinode_setup { sudo systemctl restart neutron-openvswitch-agent fi - local ping_command="ping -c 6 -W 3 192.0.2.2" + local ping_command="ping -c 6 -W 3 192.168.24.2" for ip in $sub_nodes; do log "Setting $PUB_BRIDGE_NAME up on $ip" @@ -970,9 +979,9 @@ function multinode_setup { function ui_sanity_check { if [ -f "/etc/httpd/conf.d/25-tripleo-ui.conf" ]; then if [ "$UNDERCLOUD_SSL" = 1 ]; then - UI_URL=https://192.0.2.2 + UI_URL=https://192.168.24.2 else - UI_URL=http://192.0.2.1:3000 + UI_URL=http://192.168.24.1:3000 fi if ! curl $UI_URL 2>/dev/null | grep -q 'TripleO'; then log "ERROR: TripleO UI front page is not loading." diff --git a/test-environments/enable-tls.yaml b/test-environments/enable-tls.yaml index 03a90dc29..70c7f6d5c 100644 --- a/test-environments/enable-tls.yaml +++ b/test-environments/enable-tls.yaml @@ -1,57 +1,58 @@ parameter_defaults: # Because we don't have DNS, the certificate relies on the VIP # being consistent. - ControlFixedIPs: [{'ip_address':'192.0.2.6'}] + ControlFixedIPs: [{'ip_address':'192.168.24.6'}] SSLCertificate: | -----BEGIN CERTIFICATE----- - MIIDdzCCAl+gAwIBAgIJAK42bWhJ6IsnMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV - BAYTAlVTMQswCQYDVQQIDAJOQzEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UECgwH - UmVkIEhhdDESMBAGA1UEAwwJMTkyLjAuMi42MB4XDTE2MDIxNjIyMDExMFoXDTI2 - MDIxMzIyMDExMFowUjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5DMRAwDgYDVQQH - DAdSYWxlaWdoMRAwDgYDVQQKDAdSZWQgSGF0MRIwEAYDVQQDDAkxOTIuMC4yLjYw - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HYlA6wxqe/srQJsZDuvn - jhuizqFdWC05LvDHR6s7rm/Q7b1ym6zeDc4bubiQr+UbxlmwSmS84TCF/w7tx9Oz - owI3DtTXHGX17lBiCUuRx/AoxreZ8j8HjJLhezOdDQlDk4liEQkcazc19gpIPf1Z - bhqusuIt78tIigaDFtl4BQfk+uwN+2TjFm4is99W7ZjIqP/nygcUuVzw5dunhkvv - gDHl9j7BGOVlMogS15KWIhYIz+laxUQGrjQ6LRjvcHgxnzAxLzxiYaZH3Kwu/j57 - CEENf+xLJ8tIRxSJEqbJZnjeB+Y+Hr0pRPuaDXQ4EWqGberwllfdbUQ0/LeMW1f1 - AgMBAAGjUDBOMB0GA1UdDgQWBBQcJgxHlP+is/ea5jhX/IC2HA4U3TAfBgNVHSME - GDAWgBQcJgxHlP+is/ea5jhX/IC2HA4U3TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 - DQEBBQUAA4IBAQCetlOkdufgpQrmUH3ILyaEWzrS43kZ+5HvEvqIU1P8/q+Zk9ZF - P3C0wpSw63fMFEB85mxEbAOdCLpivuivdpjht1nJD7tqfCto0LU9Jh0wWPwxXxg1 - lMRD3ssUcKL4nOF8pyzG3MohiAKDzsrGNM0NKLHD5FVvZu5eT5KgFlC/6OsksIXP - 36FG7xyBQnv1Bf9rzza1X1HVd2EGJWFxEIXBQ6jXPKHGZFqOdwT9oTMbTNOAWhSG - TB5HLL6XfixahKErUTplaPxApBsJD51YtEeso3e+qr+JrwPrvkhI6gLrZywLP6op - HP4cL1a+lV9Q3j+MRs2mq9ziRjdp2BRedqCk + MIIDhTCCAm2gAwIBAgIJAI8wrqY4AYnnMA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV + BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg + Q29tcGFueSBMdGQxFTATBgNVBAMMDDE5Mi4xNjguMjQuNjAeFw0xNjExMDkxNTIx + NDhaFw0xNzExMDkxNTIxNDhaMFkxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZh + dWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxFTATBgNVBAMM + DDE5Mi4xNjguMjQuNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOo1 + 4ECMx3cWSIIxo6wmvLINZyyUqdhEp3yEZT4KM38wDui+Sw52uVhd2WzyM6ywkFDz + ePs4X64P5KbbOJz5k5mR/4QzGDREmF9vvmzIiQ1URVxOAxGvNoc2LwHDJyYBoIF0 + s6uRwXfL6zyxc4sYsWVejDmk1JyHFcf1pSTg3pz6wsfhgnG3J/zW3kGK85TwqF3a + Fz34yNSJF9y7muRjg0K0hW392sU2xgAkjYrpk6mKweWDcEa3MU38RMrOfEw0ORGJ + MYJZjGDN7Fah12k95sUZ8Xbjnp476i63PBVpB+/rQtGsZK7AFWy/MtBRPfvNkpm+ + DqAOip2Y4WG08rgEuqsCAwEAAaNQME4wHQYDVR0OBBYEFHNIz4VamTAoAR176ZU5 + 3zGPZSR1MB8GA1UdIwQYMBaAFHNIz4VamTAoAR176ZU53zGPZSR1MAwGA1UdEwQF + MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAOU2MShnCtj3F1EqoCsx84x+fPajjy/i + Rbd+FIcGKOOBlUxLNMLQeJyB8utui1uXa0LWuun4Vc0JLdri7qSXfbOqgEi/Dkj7 + fvLPACSxLzBdHr4atIEP+WkPAL31obcuKshm0TxaMui4ymR6gIMem/uHR/rg5l6L + I6Y9hNS/A2k6HohhbIVRuT0abxmDZ9RNjJxxm0RydMwxMTtzJGJrc/t/SznFpKRf + FQ2CFh3O5w14mJaKJZPuOM8g8q/PVHSZkMO7A+2BoxDKjF/P2fPvGPQSV3AoYleu + 72dAUied9SXghzgyx5BYCJTwRL9poSG39okq+/zl4c+JVyFxweamlSI= -----END CERTIFICATE----- + SSLIntermediateCertificate: '' SSLKey: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- resource_registry: diff --git a/test-environments/inject-trust-anchor-hiera.yaml b/test-environments/inject-trust-anchor-hiera.yaml index c12b6f6c4..f67442625 100644 --- a/test-environments/inject-trust-anchor-hiera.yaml +++ b/test-environments/inject-trust-anchor-hiera.yaml @@ -3,23 +3,24 @@ parameter_defaults: self-signed-cert: content: | -----BEGIN CERTIFICATE----- - MIIDdzCCAl+gAwIBAgIJAK42bWhJ6IsnMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV - BAYTAlVTMQswCQYDVQQIDAJOQzEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UECgwH - UmVkIEhhdDESMBAGA1UEAwwJMTkyLjAuMi42MB4XDTE2MDIxNjIyMDExMFoXDTI2 - MDIxMzIyMDExMFowUjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5DMRAwDgYDVQQH - DAdSYWxlaWdoMRAwDgYDVQQKDAdSZWQgSGF0MRIwEAYDVQQDDAkxOTIuMC4yLjYw - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HYlA6wxqe/srQJsZDuvn - jhuizqFdWC05LvDHR6s7rm/Q7b1ym6zeDc4bubiQr+UbxlmwSmS84TCF/w7tx9Oz - owI3DtTXHGX17lBiCUuRx/AoxreZ8j8HjJLhezOdDQlDk4liEQkcazc19gpIPf1Z - bhqusuIt78tIigaDFtl4BQfk+uwN+2TjFm4is99W7ZjIqP/nygcUuVzw5dunhkvv - gDHl9j7BGOVlMogS15KWIhYIz+laxUQGrjQ6LRjvcHgxnzAxLzxiYaZH3Kwu/j57 - CEENf+xLJ8tIRxSJEqbJZnjeB+Y+Hr0pRPuaDXQ4EWqGberwllfdbUQ0/LeMW1f1 - AgMBAAGjUDBOMB0GA1UdDgQWBBQcJgxHlP+is/ea5jhX/IC2HA4U3TAfBgNVHSME - GDAWgBQcJgxHlP+is/ea5jhX/IC2HA4U3TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 - DQEBBQUAA4IBAQCetlOkdufgpQrmUH3ILyaEWzrS43kZ+5HvEvqIU1P8/q+Zk9ZF - P3C0wpSw63fMFEB85mxEbAOdCLpivuivdpjht1nJD7tqfCto0LU9Jh0wWPwxXxg1 - lMRD3ssUcKL4nOF8pyzG3MohiAKDzsrGNM0NKLHD5FVvZu5eT5KgFlC/6OsksIXP - 36FG7xyBQnv1Bf9rzza1X1HVd2EGJWFxEIXBQ6jXPKHGZFqOdwT9oTMbTNOAWhSG - TB5HLL6XfixahKErUTplaPxApBsJD51YtEeso3e+qr+JrwPrvkhI6gLrZywLP6op - HP4cL1a+lV9Q3j+MRs2mq9ziRjdp2BRedqCk + MIIDhTCCAm2gAwIBAgIJAI8wrqY4AYnnMA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV + BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg + Q29tcGFueSBMdGQxFTATBgNVBAMMDDE5Mi4xNjguMjQuNjAeFw0xNjExMDkxNTIx + NDhaFw0xNzExMDkxNTIxNDhaMFkxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZh + dWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxFTATBgNVBAMM + DDE5Mi4xNjguMjQuNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOo1 + 4ECMx3cWSIIxo6wmvLINZyyUqdhEp3yEZT4KM38wDui+Sw52uVhd2WzyM6ywkFDz + ePs4X64P5KbbOJz5k5mR/4QzGDREmF9vvmzIiQ1URVxOAxGvNoc2LwHDJyYBoIF0 + s6uRwXfL6zyxc4sYsWVejDmk1JyHFcf1pSTg3pz6wsfhgnG3J/zW3kGK85TwqF3a + Fz34yNSJF9y7muRjg0K0hW392sU2xgAkjYrpk6mKweWDcEa3MU38RMrOfEw0ORGJ + MYJZjGDN7Fah12k95sUZ8Xbjnp476i63PBVpB+/rQtGsZK7AFWy/MtBRPfvNkpm+ + DqAOip2Y4WG08rgEuqsCAwEAAaNQME4wHQYDVR0OBBYEFHNIz4VamTAoAR176ZU5 + 3zGPZSR1MB8GA1UdIwQYMBaAFHNIz4VamTAoAR176ZU53zGPZSR1MAwGA1UdEwQF + MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAOU2MShnCtj3F1EqoCsx84x+fPajjy/i + Rbd+FIcGKOOBlUxLNMLQeJyB8utui1uXa0LWuun4Vc0JLdri7qSXfbOqgEi/Dkj7 + fvLPACSxLzBdHr4atIEP+WkPAL31obcuKshm0TxaMui4ymR6gIMem/uHR/rg5l6L + I6Y9hNS/A2k6HohhbIVRuT0abxmDZ9RNjJxxm0RydMwxMTtzJGJrc/t/SznFpKRf + FQ2CFh3O5w14mJaKJZPuOM8g8q/PVHSZkMO7A+2BoxDKjF/P2fPvGPQSV3AoYleu + 72dAUied9SXghzgyx5BYCJTwRL9poSG39okq+/zl4c+JVyFxweamlSI= -----END CERTIFICATE----- + diff --git a/test-environments/inject-trust-anchor.yaml b/test-environments/inject-trust-anchor.yaml index a7976e373..afc21a85b 100644 --- a/test-environments/inject-trust-anchor.yaml +++ b/test-environments/inject-trust-anchor.yaml @@ -1,25 +1,26 @@ parameter_defaults: SSLRootCertificate: | -----BEGIN CERTIFICATE----- - MIIDdzCCAl+gAwIBAgIJAK42bWhJ6IsnMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV - BAYTAlVTMQswCQYDVQQIDAJOQzEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UECgwH - UmVkIEhhdDESMBAGA1UEAwwJMTkyLjAuMi42MB4XDTE2MDIxNjIyMDExMFoXDTI2 - MDIxMzIyMDExMFowUjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5DMRAwDgYDVQQH - DAdSYWxlaWdoMRAwDgYDVQQKDAdSZWQgSGF0MRIwEAYDVQQDDAkxOTIuMC4yLjYw - ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HYlA6wxqe/srQJsZDuvn - jhuizqFdWC05LvDHR6s7rm/Q7b1ym6zeDc4bubiQr+UbxlmwSmS84TCF/w7tx9Oz - owI3DtTXHGX17lBiCUuRx/AoxreZ8j8HjJLhezOdDQlDk4liEQkcazc19gpIPf1Z - bhqusuIt78tIigaDFtl4BQfk+uwN+2TjFm4is99W7ZjIqP/nygcUuVzw5dunhkvv - gDHl9j7BGOVlMogS15KWIhYIz+laxUQGrjQ6LRjvcHgxnzAxLzxiYaZH3Kwu/j57 - CEENf+xLJ8tIRxSJEqbJZnjeB+Y+Hr0pRPuaDXQ4EWqGberwllfdbUQ0/LeMW1f1 - AgMBAAGjUDBOMB0GA1UdDgQWBBQcJgxHlP+is/ea5jhX/IC2HA4U3TAfBgNVHSME - GDAWgBQcJgxHlP+is/ea5jhX/IC2HA4U3TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 - DQEBBQUAA4IBAQCetlOkdufgpQrmUH3ILyaEWzrS43kZ+5HvEvqIU1P8/q+Zk9ZF - P3C0wpSw63fMFEB85mxEbAOdCLpivuivdpjht1nJD7tqfCto0LU9Jh0wWPwxXxg1 - lMRD3ssUcKL4nOF8pyzG3MohiAKDzsrGNM0NKLHD5FVvZu5eT5KgFlC/6OsksIXP - 36FG7xyBQnv1Bf9rzza1X1HVd2EGJWFxEIXBQ6jXPKHGZFqOdwT9oTMbTNOAWhSG - TB5HLL6XfixahKErUTplaPxApBsJD51YtEeso3e+qr+JrwPrvkhI6gLrZywLP6op - HP4cL1a+lV9Q3j+MRs2mq9ziRjdp2BRedqCk + MIIDhTCCAm2gAwIBAgIJAI8wrqY4AYnnMA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV + BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg + Q29tcGFueSBMdGQxFTATBgNVBAMMDDE5Mi4xNjguMjQuNjAeFw0xNjExMDkxNTIx + NDhaFw0xNzExMDkxNTIxNDhaMFkxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZh + dWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxFTATBgNVBAMM + DDE5Mi4xNjguMjQuNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOo1 + 4ECMx3cWSIIxo6wmvLINZyyUqdhEp3yEZT4KM38wDui+Sw52uVhd2WzyM6ywkFDz + ePs4X64P5KbbOJz5k5mR/4QzGDREmF9vvmzIiQ1URVxOAxGvNoc2LwHDJyYBoIF0 + s6uRwXfL6zyxc4sYsWVejDmk1JyHFcf1pSTg3pz6wsfhgnG3J/zW3kGK85TwqF3a + Fz34yNSJF9y7muRjg0K0hW392sU2xgAkjYrpk6mKweWDcEa3MU38RMrOfEw0ORGJ + MYJZjGDN7Fah12k95sUZ8Xbjnp476i63PBVpB+/rQtGsZK7AFWy/MtBRPfvNkpm+ + DqAOip2Y4WG08rgEuqsCAwEAAaNQME4wHQYDVR0OBBYEFHNIz4VamTAoAR176ZU5 + 3zGPZSR1MB8GA1UdIwQYMBaAFHNIz4VamTAoAR176ZU53zGPZSR1MAwGA1UdEwQF + MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAOU2MShnCtj3F1EqoCsx84x+fPajjy/i + Rbd+FIcGKOOBlUxLNMLQeJyB8utui1uXa0LWuun4Vc0JLdri7qSXfbOqgEi/Dkj7 + fvLPACSxLzBdHr4atIEP+WkPAL31obcuKshm0TxaMui4ymR6gIMem/uHR/rg5l6L + I6Y9hNS/A2k6HohhbIVRuT0abxmDZ9RNjJxxm0RydMwxMTtzJGJrc/t/SznFpKRf + FQ2CFh3O5w14mJaKJZPuOM8g8q/PVHSZkMO7A+2BoxDKjF/P2fPvGPQSV3AoYleu + 72dAUied9SXghzgyx5BYCJTwRL9poSG39okq+/zl4c+JVyFxweamlSI= -----END CERTIFICATE----- + resource_registry: OS::TripleO::NodeTLSCAData: /usr/share/openstack-tripleo-heat-templates/puppet/extraconfig/tls/ca-inject.yaml diff --git a/test-environments/ipv6-network-templates/network-environment.yaml b/test-environments/ipv6-network-templates/network-environment.yaml index 824081a6b..d845650cd 100644 --- a/test-environments/ipv6-network-templates/network-environment.yaml +++ b/test-environments/ipv6-network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 2001:db8:fd00:1000::/64 ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}] ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000::1 diff --git a/test-environments/ipv6-network-templates/ui-settings.pickle b/test-environments/ipv6-network-templates/ui-settings.pickle index bc3ac5a97..725c716c5 100644 --- a/test-environments/ipv6-network-templates/ui-settings.pickle +++ b/test-environments/ipv6-network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/test-environments/net-iso.yaml b/test-environments/net-iso.yaml index cb789cc5b..6a76b6388 100644 --- a/test-environments/net-iso.yaml +++ b/test-environments/net-iso.yaml @@ -1,5 +1,5 @@ parameter_defaults: ControlPlaneSubnetCidr: "24" - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 DnsServers: ["8.8.8.8","8.8.4.4"] diff --git a/test-environments/network-templates/network-environment.yaml b/test-environments/network-templates/network-environment.yaml index 05b0d1fb2..466aa80e7 100644 --- a/test-environments/network-templates/network-environment.yaml +++ b/test-environments/network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/test-environments/network-templates/ui-settings.pickle b/test-environments/network-templates/ui-settings.pickle index 1143fbf26..4bdc21de5 100644 --- a/test-environments/network-templates/ui-settings.pickle +++ b/test-environments/network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/test-environments/overcloud-cacert.pem b/test-environments/overcloud-cacert.pem index 626be07f7..fe6206e70 100644 --- a/test-environments/overcloud-cacert.pem +++ b/test-environments/overcloud-cacert.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDdzCCAl+gAwIBAgIJAK42bWhJ6IsnMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV -BAYTAlVTMQswCQYDVQQIDAJOQzEQMA4GA1UEBwwHUmFsZWlnaDEQMA4GA1UECgwH -UmVkIEhhdDESMBAGA1UEAwwJMTkyLjAuMi42MB4XDTE2MDIxNjIyMDExMFoXDTI2 -MDIxMzIyMDExMFowUjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5DMRAwDgYDVQQH -DAdSYWxlaWdoMRAwDgYDVQQKDAdSZWQgSGF0MRIwEAYDVQQDDAkxOTIuMC4yLjYw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HYlA6wxqe/srQJsZDuvn -jhuizqFdWC05LvDHR6s7rm/Q7b1ym6zeDc4bubiQr+UbxlmwSmS84TCF/w7tx9Oz -owI3DtTXHGX17lBiCUuRx/AoxreZ8j8HjJLhezOdDQlDk4liEQkcazc19gpIPf1Z -bhqusuIt78tIigaDFtl4BQfk+uwN+2TjFm4is99W7ZjIqP/nygcUuVzw5dunhkvv -gDHl9j7BGOVlMogS15KWIhYIz+laxUQGrjQ6LRjvcHgxnzAxLzxiYaZH3Kwu/j57 -CEENf+xLJ8tIRxSJEqbJZnjeB+Y+Hr0pRPuaDXQ4EWqGberwllfdbUQ0/LeMW1f1 -AgMBAAGjUDBOMB0GA1UdDgQWBBQcJgxHlP+is/ea5jhX/IC2HA4U3TAfBgNVHSME -GDAWgBQcJgxHlP+is/ea5jhX/IC2HA4U3TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3 -DQEBBQUAA4IBAQCetlOkdufgpQrmUH3ILyaEWzrS43kZ+5HvEvqIU1P8/q+Zk9ZF -P3C0wpSw63fMFEB85mxEbAOdCLpivuivdpjht1nJD7tqfCto0LU9Jh0wWPwxXxg1 -lMRD3ssUcKL4nOF8pyzG3MohiAKDzsrGNM0NKLHD5FVvZu5eT5KgFlC/6OsksIXP -36FG7xyBQnv1Bf9rzza1X1HVd2EGJWFxEIXBQ6jXPKHGZFqOdwT9oTMbTNOAWhSG -TB5HLL6XfixahKErUTplaPxApBsJD51YtEeso3e+qr+JrwPrvkhI6gLrZywLP6op -HP4cL1a+lV9Q3j+MRs2mq9ziRjdp2BRedqCk +MIIDhTCCAm2gAwIBAgIJAI8wrqY4AYnnMA0GCSqGSIb3DQEBCwUAMFkxCzAJBgNV +BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg +Q29tcGFueSBMdGQxFTATBgNVBAMMDDE5Mi4xNjguMjQuNjAeFw0xNjExMDkxNTIx +NDhaFw0xNzExMDkxNTIxNDhaMFkxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZh +dWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxFTATBgNVBAMM +DDE5Mi4xNjguMjQuNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOo1 +4ECMx3cWSIIxo6wmvLINZyyUqdhEp3yEZT4KM38wDui+Sw52uVhd2WzyM6ywkFDz +ePs4X64P5KbbOJz5k5mR/4QzGDREmF9vvmzIiQ1URVxOAxGvNoc2LwHDJyYBoIF0 +s6uRwXfL6zyxc4sYsWVejDmk1JyHFcf1pSTg3pz6wsfhgnG3J/zW3kGK85TwqF3a +Fz34yNSJF9y7muRjg0K0hW392sU2xgAkjYrpk6mKweWDcEa3MU38RMrOfEw0ORGJ +MYJZjGDN7Fah12k95sUZ8Xbjnp476i63PBVpB+/rQtGsZK7AFWy/MtBRPfvNkpm+ +DqAOip2Y4WG08rgEuqsCAwEAAaNQME4wHQYDVR0OBBYEFHNIz4VamTAoAR176ZU5 +3zGPZSR1MB8GA1UdIwQYMBaAFHNIz4VamTAoAR176ZU53zGPZSR1MAwGA1UdEwQF +MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAOU2MShnCtj3F1EqoCsx84x+fPajjy/i +Rbd+FIcGKOOBlUxLNMLQeJyB8utui1uXa0LWuun4Vc0JLdri7qSXfbOqgEi/Dkj7 +fvLPACSxLzBdHr4atIEP+WkPAL31obcuKshm0TxaMui4ymR6gIMem/uHR/rg5l6L +I6Y9hNS/A2k6HohhbIVRuT0abxmDZ9RNjJxxm0RydMwxMTtzJGJrc/t/SznFpKRf +FQ2CFh3O5w14mJaKJZPuOM8g8q/PVHSZkMO7A+2BoxDKjF/P2fPvGPQSV3AoYleu +72dAUied9SXghzgyx5BYCJTwRL9poSG39okq+/zl4c+JVyFxweamlSI= -----END CERTIFICATE----- diff --git a/toci_instack_osinfra.sh b/toci_instack_osinfra.sh index 3ee5d19f6..5ced2a496 100755 --- a/toci_instack_osinfra.sh +++ b/toci_instack_osinfra.sh @@ -19,7 +19,7 @@ MY_IP=$(ip addr show dev $IP_DEVICE | awk '/inet / {gsub("/.*", "") ; print $2}' MY_IP_eth1=$(ip addr show dev eth1 | awk '/inet / {gsub("/.*", "") ; print $2}') || MY_IP_eth1="" export http_proxy="" -undercloud_net_range="192.0.2." +undercloud_net_range="192.168.24." undercloud_services_ip=$undercloud_net_range"1" undercloud_haproxy_public_ip=$undercloud_net_range"2" undercloud_haproxy_admin_ip=$undercloud_net_range"3" diff --git a/toci_instack_ovb.sh b/toci_instack_ovb.sh index b596a371e..a55420ffd 100755 --- a/toci_instack_ovb.sh +++ b/toci_instack_ovb.sh @@ -30,7 +30,7 @@ sudo yum install -y xfsprogs sudo yum remove -y puppet hiera puppetlabs-release rdo-release sudo rm -rf /etc/puppet /etc/hiera.yaml -undercloud_net_range="192.0.2." +undercloud_net_range="192.168.24." undercloud_services_ip=$undercloud_net_range"1" undercloud_haproxy_public_ip=$undercloud_net_range"2" undercloud_haproxy_admin_ip=$undercloud_net_range"3"