diff options
Diffstat (limited to 'mcp')
13 files changed, 37 insertions, 35 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 index c129a0a12..495dfa27b 100644 --- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 @@ -48,7 +48,7 @@ parameters: - cluster.${_param:cluster_name}.openstack.compute params: pxe_admin_address: {{ nm.net_admin | ipnet_hostaddr(admin) }} - control_address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }} + single_address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }} tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }} external_address: {{ nm.net_public | ipnet_hostaddr(pub) }} salt_master_host: ${_param:reclass_config_master} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 index cdb992a06..ae59316bd 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml.j2 @@ -147,7 +147,7 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: ${_param:hwe_kernel} cluster: - saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main" + saltstack_repo_xenial: "deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main" linux: network: interface: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index c7c6f2fab..7f1cb3a0b 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -23,7 +23,7 @@ classes: parameters: _param: cluster_vip_address: ${_param:openstack_control_address} - cluster_local_address: ${_param:control_address} + cluster_local_address: ${_param:single_address} cluster_node01_hostname: ${_param:openstack_control_node01_hostname} cluster_node01_address: ${_param:openstack_control_node01_address} cluster_node02_hostname: ${_param:openstack_control_node02_hostname} @@ -35,7 +35,6 @@ parameters: keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 linux_system_codename: xenial - single_address: ${_param:control_address} glusterfs_version: '3.13' glusterfs: client: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index 671f6eb07..bfa46ac5c 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -21,7 +21,6 @@ parameters: _param: interface_mtu: 9000 linux_system_codename: xenial - single_address: ${_param:control_address} nova: compute: libvirt_service: libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 index 6bd61a2d4..4f22d4fa2 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 @@ -39,15 +39,22 @@ parameters: external_interface: enabled: true name: ${_param:external_interface} - mtu: ${_param:interface_mtu} proto: manual - type: eth - gateway: ${_param:opnfv_net_public_gw} - name_servers: {{ nm.dns_public }} + ovs_port_type: OVSPort + type: ovs_port + ovs_bridge: br-floating + bridge: br-floating br-floating: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} + proto: static + address: ${_param:external_address} + netmask: ${_param:opnfv_net_public_mask} + use_interfaces: + - ${_param:external_interface} + gateway: ${_param:opnfv_net_public_gw} + name_servers: {{ nm.dns_public }} br-mgmt: enabled: true type: bridge @@ -57,18 +64,3 @@ parameters: mtu: ${_param:interface_mtu} use_interfaces: - ${_param:primary_interface} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: ${_param:opnfv_net_public_mask} - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 index a6027e08a..685cd9ec1 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 @@ -18,7 +18,7 @@ parameters: opendaylight: server: odl_bind_ip: ${_param:single_address} - odl_rest_port: 8282 + odl_rest_port: ${_param:opendaylight_rest_port} java_min_mem: 6g java_max_mem: 6g router_enabled: true diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml index 547b61e0f..e2912fa3b 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml @@ -17,5 +17,7 @@ parameters: openrc_extra: # For HA, all public services are available through nginx on prx sdn_controller_ip: ${_param:cluster_public_host} - sdn_username: admin # Hardcoded to default ODL values for now - sdn_password: admin + sdn_controller_user: admin # Hardcoded to default ODL values for now + sdn_controller_password: admin + sdn_controller_webport: ${_param:opendaylight_rest_port} + sdn_controller_restconfport: ${_param:opendaylight_rest_port} diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 index 43779e927..6301e737a 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 @@ -12,6 +12,7 @@ parameters: _param: # opendaylight options opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} + opendaylight_rest_port: 8282 neutron_tenant_network_types: "flat,vxlan" {%- if conf.MCP_VCP %} diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml index f0d4ecc37..ef67f3b15 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml @@ -21,8 +21,8 @@ parameters: check: false proxy: host: ${_param:opendaylight_service_host} - port: 8282 + port: ${_param:opendaylight_rest_port} protocol: http host: name: ${_param:nginx_proxy_openstack_api_host} - port: 8282 + port: ${_param:opendaylight_rest_port} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml index 0b513f065..536ebfad7 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml @@ -18,7 +18,7 @@ parameters: opendaylight: server: odl_bind_ip: ${_param:single_address} - odl_rest_port: 8282 + odl_rest_port: ${_param:opendaylight_rest_port} java_min_mem: 3g java_max_mem: 3g router_enabled: true diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml index f5ed2dc5d..03bd1efd4 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml @@ -19,16 +19,18 @@ parameters: service_name: opendaylight binds: - address: ${_param:cluster_vip_address} - port: 8282 + port: ${_param:opendaylight_rest_port} servers: - name: odl01 host: ${_param:opendaylight_service_host} - port: 8282 + port: ${_param:opendaylight_rest_port} params: ${_param:haproxy_check} keystone: server: openrc_extra: # For noHA, all public services are available through haproxy on ctl sdn_controller_ip: ${_param:cluster_vip_address} - sdn_username: admin # Hardcoded to default ODL values for now - sdn_password: admin + sdn_controller_user: admin # Hardcoded to default ODL values for now + sdn_controller_password: admin + sdn_controller_webport: ${_param:opendaylight_rest_port} + sdn_controller_restconfport: ${_param:opendaylight_rest_port} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml index 91e002667..a3918b231 100644 --- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml @@ -12,6 +12,7 @@ parameters: _param: neutron_tenant_network_types: "flat,vxlan" opendaylight_router: odl-router_v2 + opendaylight_rest_port: 8282 linux: network: host: diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index e9af3363e..6a250dd67 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -29,8 +29,14 @@ NODE_MASK="${LOCAL_VIRT_NODES// /|}" # push to cfg01 current git repo first (including submodules), at ~ubuntu/opnfv # later we move it to ~root/opnfv (and ln as ~root/fuel); delete the temp clone remote_tmp="${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")" +STORAGE_DIR=$(dirname "${LOCAL_PDF_RECLASS}") +REL_STORAGE_DIR_PATH=${STORAGE_DIR#${LOCAL_GIT_DIR}} +if [[ "${REL_STORAGE_DIR_PATH}" == "${STORAGE_DIR}" ]] +then + REL_STORAGE_DIR_PATH="" +fi rsync -Erl --delete -e "ssh ${SSH_OPTS}" \ - --exclude-from="${F_GIT_ROOT}/.gitignore" \ + --exclude={.gitignore,"$REL_STORAGE_DIR_PATH"} \ "${LOCAL_GIT_DIR}/" "${remote_tmp}/" if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \ |