diff options
Diffstat (limited to 'mcp')
124 files changed, 2121 insertions, 1641 deletions
diff --git a/mcp/config/labs/local/idf-pod1.yaml b/mcp/config/labs/local/idf-pod1.yaml new file mode 100644 index 000000000..7932f8896 --- /dev/null +++ b/mcp/config/labs/local/idf-pod1.yaml @@ -0,0 +1,12 @@ +--- +### LF POD 2 installer descriptor file ### + +idf: + version: 0.1 + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-ctl' + private: '' + public: '' diff --git a/mcp/config/labs/local/pod1.yaml b/mcp/config/labs/local/pod1.yaml new file mode 100644 index 000000000..702a53398 --- /dev/null +++ b/mcp/config/labs/local/pod1.yaml @@ -0,0 +1,226 @@ +--- +### LF POD 2 descriptor file ### + +details: + pod_owner: Trevor Bramwell + contact: tbramwell@linuxfoundation.org + lab: LF Pharos Lab + location: Portland + type: production + link: https://wiki.opnfv.org/display/pharos/LF+POD+2 +############################################################################## +net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 172.30.8.65-172.30.8.75 + vlan: 410 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 0 + vlan: 300 + network: 10.167.4.0 # Tagged, 'vlan 300' on wiki + mask: 24 + storage: + interface: 3 + vlan: 301 + network: 10.2.0.0 # Tagged, not the same with 'storage' on wiki + mask: 24 + private: + interface: 1 + vlan: 1000 + network: 10.1.0.0 # Tagged, not the same with 'private' on wiki + mask: 24 + public: + interface: 2 + vlan: native + network: 172.30.10.0 # Untagged, 'public' on wiki + mask: 24 + gateway: 172.30.10.1 + dns: + - 8.8.8.8 + - 8.8.4.4 +############################################################################## +jumphost: + name: pod2-jump + node: + type: baremetal + vendor: Cisco Systems Inc + model: UCSB-B200-M4 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 8 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 2400G + disk_type: hdd + disk_interface: sas + disk_rotation: + os: centos-7 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: admin + pass: octopus + remote_management: + <<: *remote_params + address: 172.30.8.83 + mac_address: "a8:9d:21:c9:c4:9e" + interfaces: + - mac_address: "00:25:b5:a0:00:1a" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:1b" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:1c" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:1d" + speed: 40gb + features: 'dpdk|sriov' + fixed_ips: + admin: 192.168.11.1 + mgmt: 10.167.4.1 + public: 172.30.10.72 +############################################################################## +nodes: + - name: pod2-node1 + node: &nodeparams + type: baremetal + vendor: Cisco Systems Inc + model: UCSB-B200-M4 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 8 + memory: 32G + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.75 + mac_address: "a8:9d:21:c9:8b:56" + interfaces: + - mac_address: "00:25:b5:a0:00:2a" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:2b" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:2c" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:2d" + speed: 40gb + features: 'dpdk|sriov' + fixed_ips: + admin: 192.168.11.2 + mgmt: 10.167.4.2 + public: 172.30.10.2 + ############################################################################ + - name: pod2-node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.65 + mac_address: "a8:9d:21:c9:4d:26" + interfaces: + - mac_address: "00:25:b5:a0:00:3a" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:3b" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:3c" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:3d" + speed: 40gb + features: 'dpdk|sriov' + fixed_ips: + admin: 192.168.11.3 + mgmt: 10.167.4.3 + public: 172.30.10.3 + ############################################################################ + - name: pod2-node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.74 + mac_address: "a8:9d:21:c9:3a:92" + interfaces: + - mac_address: "00:25:b5:a0:00:4a" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:4b" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:4c" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:4d" + speed: 40gb + features: 'dpdk|sriov' + fixed_ips: + admin: 192.168.11.4 + mgmt: 10.167.4.4 + public: 172.30.10.4 + ############################################################################ + - name: pod2-node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.73 + mac_address: "74:a2:e6:a4:14:9c" + interfaces: + - mac_address: "00:25:b5:a0:00:5a" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:5b" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:5c" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:5d" + speed: 40gb + features: 'dpdk|sriov' + fixed_ips: + admin: 192.168.11.5 + mgmt: 10.167.4.5 + public: 172.30.10.5 + ############################################################################ + - name: pod2-node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.72 + mac_address: "a8:9d:21:a0:15:9c" + interfaces: + - mac_address: "00:25:b5:a0:00:6a" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:6b" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:6c" + speed: 40gb + features: 'dpdk|sriov' + - mac_address: "00:25:b5:a0:00:6d" + speed: 40gb + features: 'dpdk|sriov' + fixed_ips: + admin: 192.168.11.6 + mgmt: 10.167.4.6 + public: 172.30.10.6 diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml index ad1b8a7ab..ca5b6a24d 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml @@ -1,3 +1,4 @@ +--- cluster: domain: baremetal-mcp-ocata-ovs-ha.local states: diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml index c5820be09..6eb1e33ce 100644 --- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml +++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml @@ -1,9 +1,11 @@ +--- cluster: domain: baremetal-mcp-ocata-ovs-dpdk-ha.local states: - maas - dpdk - openstack_ha + - neutron_compute - networks virtual: nodes: diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml index 20d9107ca..893b6797b 100644 --- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml +++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml @@ -1,3 +1,4 @@ +--- cluster: domain: baremetal-mcp-ocata-odl-ha.local states: diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml index 17fbbfcbe..0790bbb7c 100644 --- a/mcp/config/scenario/defaults-aarch64.yaml +++ b/mcp/config/scenario/defaults-aarch64.yaml @@ -1,6 +1,7 @@ +--- +# yamllint disable-line rule:line-length base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img virtual: default: vcpus: 6 ram: 4096 - diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml index b841e88c9..adb6f6241 100644 --- a/mcp/config/scenario/defaults-x86_64.yaml +++ b/mcp/config/scenario/defaults-x86_64.yaml @@ -1,6 +1,7 @@ +--- +# yamllint disable-line rule:line-length base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img virtual: default: vcpus: 2 ram: 4096 - diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml index 7208d89f2..862029912 100644 --- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml @@ -1,3 +1,4 @@ +--- cluster: domain: virtual-mcp-ocata-ovs.local states: diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml index 540761cbf..02977f793 100644 --- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml @@ -1,3 +1,4 @@ +--- cluster: domain: virtual-mcp-ocata-ovs-dpdk.local states: diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml index de95e503d..b3684c109 100644 --- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml @@ -1,3 +1,4 @@ +--- cluster: domain: virtual-mcp-ocata-odl-router.local states: diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index ad435630c..9eba5c083 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -10,9 +10,5 @@ salt -I 'nova:compute' cmd.run 'rm -vrf /etc/apt/preferences.d/*' salt -I 'nova:compute' file.remove '/etc/apt/sources.list.d/mirantis_openstack.list' salt -I 'nova:compute' pkg.refresh_db -salt -I 'nova:compute' pkg.install neutron-common -salt -I 'nova:compute' file.append /etc/sudoers.d/neutron_sudoers \ - args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' - salt -I 'nova:compute' pkg.install libvirt-bin salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm diff --git a/mcp/config/states/maas b/mcp/config/states/maas index de9d699b9..67ef6d559 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -17,8 +17,11 @@ function wait_for() { # Wait for MaaS commissioning/deploy to finish, retry on failure function maas_fixup() { local statuscmd="salt 'mas01*' --out yaml state.apply maas.machines.status" + # shellcheck disable=SC2155 + local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \ + grep -cE '^\s{2}\w+:$') wait_for 180 "${statuscmd} | tee /dev/stderr | " \ - "grep -Eq '((Deployed|Ready): 5|status:Failed|status:Allocated)'" + "grep -Eq '((Deployed|Ready): ${ncount}|status:Failed|status:Allocated)'" # shellcheck disable=SC2155 local statusout=$(eval "${statuscmd}") @@ -114,7 +117,3 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \ $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")" - -# Get the latest packages -wait_for 10 "! salt '*' pkg.upgrade refresh=False | " \ - "tee /dev/stderr | fgrep -q 'Not connected'" diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute index d58162100..6266b0f18 100755 --- a/mcp/config/states/neutron_compute +++ b/mcp/config/states/neutron_compute @@ -2,3 +2,5 @@ set -x salt -I 'neutron:compute' state.sls neutron +salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \ + args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index bee4c8586..e1ec1982f 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -3,4 +3,5 @@ set -x salt -I 'opendaylight:server' state.sls opendaylight salt -I 'opendaylight:client' state.sls opendaylight.client +salt -I 'opendaylight:client' cmd.run 'neutron-odl-ovs-hostconfig --noovs_dpdk' salt -I 'neutron:server' state.sls opendaylight.client diff --git a/mcp/metadata/service/opendaylight/server/single.yml b/mcp/metadata/service/opendaylight/server/single.yml index 4ee0aafde..aca1b5d62 100644 --- a/mcp/metadata/service/opendaylight/server/single.yml +++ b/mcp/metadata/service/opendaylight/server/single.yml @@ -1,8 +1,9 @@ +--- applications: -- opendaylight + - opendaylight parameters: opendaylight: server: - enabled: True + enabled: 'True' logging: engine: syslog diff --git a/mcp/metadata/service/opendaylight/support.yml b/mcp/metadata/service/opendaylight/support.yml index 0e992367e..3b3c02761 100644 --- a/mcp/metadata/service/opendaylight/support.yml +++ b/mcp/metadata/service/opendaylight/support.yml @@ -1,3 +1,4 @@ +--- parameters: opendaylight: _support: diff --git a/mcp/patches/0001-opendaylight-formula-neutron.patch b/mcp/patches/0001-opendaylight-formula-neutron.patch index e52d315a5..7afbc30e5 100644 --- a/mcp/patches/0001-opendaylight-formula-neutron.patch +++ b/mcp/patches/0001-opendaylight-formula-neutron.patch @@ -26,23 +26,32 @@ index d327e64..ba5f933 100644 # Allows for serving metadata requests coming from a dedicated metadata access network whose CIDR is 169.254.169.254/16 (or larger prefix), # and is connected to a Neutron router from which the VMs send metadata:1 request. In this case DHCP Option 121 will not be injected in VMs, diff --git a/neutron/files/ocata/ml2_conf.ini b/neutron/files/ocata/ml2_conf.ini -index 0d48951..347eb15 100644 +index 5ecafe3..48cec1f 100644 --- a/neutron/files/ocata/ml2_conf.ini +++ b/neutron/files/ocata/ml2_conf.ini -@@ -269,3 +269,11 @@ enable_security_group = True +@@ -131,7 +131,7 @@ tenant_network_types = {{ server.backend.tenant_network_types }} + # An ordered list of networking mechanism driver entrypoints to be loaded from + # the neutron.ml2.mechanism_drivers namespace. (list value) + #mechanism_drivers = +-mechanism_drivers ={%- for backend_name, mechanism in server.backend.get('mechanism', {}).iteritems() %}{{ mechanism.driver }},{%- endfor %}l2population ++mechanism_drivers ={%- for backend_name, mechanism in server.backend.get('mechanism', {}).iteritems() %}{{ mechanism.driver }}{%- endfor %}{%- if server.backend.engine == "ml2" %},l2population{%- endif %} + + # An ordered list of extension driver entrypoints to be loaded from the + # neutron.ml2.extension_drivers namespace. For example: extension_drivers = +@@ -272,3 +272,11 @@ enable_security_group = True # Use ipset to speed-up the iptables based security groups. Enabling ipset # support requires that ipset is installed on L2 agent node. (boolean value) #enable_ipset = true + +{%- if server.backend.engine == "opendaylight" %} +[ml2_odl] -+port_binding_controller = network-topology ++port_binding_controller = pseudo-agentdb-binding +url = http://{{ server.backend.host }}:{{ server.backend.rest_api_port }}/controller/nb/v2/neutron +username = {{ server.backend.user }} +password = {{ server.backend.password }} +{%- endif %} diff --git a/neutron/files/ocata/neutron-generic.conf.Debian b/neutron/files/ocata/neutron-generic.conf.Debian -index 0dde78f..05ac805 100644 +index 123386d..eeaa3f4 100644 --- a/neutron/files/ocata/neutron-generic.conf.Debian +++ b/neutron/files/ocata/neutron-generic.conf.Debian @@ -33,11 +33,11 @@ state_path = /var/lib/neutron @@ -59,7 +68,7 @@ index 0dde78f..05ac805 100644 {% endif %} -@@ -2073,3 +2073,8 @@ heartbeat_rate = 2 +@@ -2092,3 +2092,8 @@ heartbeat_rate = 2 # Sets the list of available ciphers. value should be a string in the OpenSSL # cipher list format. (string value) #ciphers = <None> @@ -72,7 +81,7 @@ diff --git a/neutron/files/ocata/neutron-server b/neutron/files/ocata/neutron-se index 54f6ceb..1682ee0 100644 --- a/neutron/files/ocata/neutron-server +++ b/neutron/files/ocata/neutron-server -@@ -7,7 +7,7 @@ +@@ -7,10 +7,10 @@ # neutron.conf #NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini" @@ -81,8 +90,13 @@ index 54f6ceb..1682ee0 100644 NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/ml2/ml2_conf.ini" {%- endif %} + {%- if server.backend.engine == "contrail" %} + NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/opencontrail/ContrailPlugin.ini" +-{%- endif %} +\ No newline at end of file ++{%- endif %} diff --git a/neutron/files/ocata/neutron-server.conf.Debian b/neutron/files/ocata/neutron-server.conf.Debian -index 229d342..ac8bdff 100644 +index 049544b..4e68567 100644 --- a/neutron/files/ocata/neutron-server.conf.Debian +++ b/neutron/files/ocata/neutron-server.conf.Debian @@ -39,11 +39,11 @@ api_extensions_path = extensions:/usr/lib/python2.7/dist-packages/neutron_plugin @@ -97,9 +111,9 @@ index 229d342..ac8bdff 100644 -service_plugins =neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,neutron.services.metering.metering_plugin.MeteringPlugin +service_plugins = {{ server.backend.get('router', 'router')}},metering {%- if server.lbaas is defined -%},lbaasv2{%- endif -%} + {%- if fwaas.get('enabled', False) -%},{{ fwaas[fwaas.api_version]['service_plugin'] }}{%- endif -%} {%- if server.get('qos', 'True') -%},neutron.services.qos.qos_plugin.QoSPlugin{%- endif -%} - {%- if server.get('vlan_aware_vms', False) -%},trunk{%- endif -%} -@@ -835,7 +835,7 @@ allow_headers = {{ server.cors.allow_headers }} +@@ -838,7 +838,7 @@ allow_headers = {{ server.cors.allow_headers }} # Deprecated group/name - [DEFAULT]/sql_connection # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection @@ -108,7 +122,7 @@ index 229d342..ac8bdff 100644 connection = {{ server.database.engine }}+pymysql://{{ server.database.user }}:{{ server.database.password }}@{{ server.database.host }}/{{ server.database.name }}?charset=utf8 {% else %} connection = sqlite:////var/lib/neutron/neutron.sqlite -@@ -2198,3 +2198,8 @@ service_provider = LOADBALANCERV2:Opencontrail:neutron_plugin_contrail.plugins.o +@@ -2217,3 +2217,8 @@ service_provider = LOADBALANCERV2:Opencontrail:neutron_plugin_contrail.plugins.o {% include "neutron/files/"+server.version+"/ContrailPlugin.ini" %} {% endif %} @@ -118,10 +132,10 @@ index 229d342..ac8bdff 100644 +ovsdb_connection = {{ server.backend.ovsdb_connection }} +{%- endif %} diff --git a/neutron/gateway.sls b/neutron/gateway.sls -index a6e6586..ab4bb85 100644 +index 96d7e9f..65386b4 100644 --- a/neutron/gateway.sls +++ b/neutron/gateway.sls -@@ -27,6 +27,7 @@ neutron_gateway_packages: +@@ -32,6 +32,7 @@ neutron_gateway_packages: /etc/neutron/dhcp_agent.ini: file.managed: - source: salt://neutron/files/{{ gateway.version }}/dhcp_agent.ini @@ -130,10 +144,10 @@ index a6e6586..ab4bb85 100644 - pkg: neutron_gateway_packages diff --git a/neutron/server.sls b/neutron/server.sls -index 0b3a6be..7a6bd23 100644 +index eff9fb8..cb9d622 100644 --- a/neutron/server.sls +++ b/neutron/server.sls -@@ -64,7 +64,7 @@ neutron_server_service: +@@ -72,7 +72,7 @@ neutron_server_service: {%- endif %} diff --git a/mcp/patches/0007-linux.network.interface-noifupdown-support.patch b/mcp/patches/0007-linux.network.interface-noifupdown-support.patch index 5d9ce7be5..194f17567 100644 --- a/mcp/patches/0007-linux.network.interface-noifupdown-support.patch +++ b/mcp/patches/0007-linux.network.interface-noifupdown-support.patch @@ -13,13 +13,12 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> --- diff --git a/linux/map.jinja b/linux/map.jinja -index d3227ca..8a2243d 100644 --- a/linux/map.jinja +++ b/linux/map.jinja @@ -92,6 +92,7 @@ - 'updelay', 'hashing-algorithm', 'hardware-dma-ring-rx', + 'hwaddr', + 'noifupdown', ] %} diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 4140adb67..e20a34179 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -1,4 +1,3 @@ -/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch diff --git a/mcp/patches/patches_neutron.list b/mcp/patches/patches_neutron.list new file mode 100644 index 000000000..e80d7617d --- /dev/null +++ b/mcp/patches/patches_neutron.list @@ -0,0 +1 @@ +/usr/share/salt-formulas/env: 0001-opendaylight-formula-neutron.patch diff --git a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch new file mode 100644 index 000000000..59a0e975a --- /dev/null +++ b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch @@ -0,0 +1,27 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 3 Oct 2017 02:41:41 +0200 +Subject: [PATCH] Add IDF mappings to installer adapter + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + config/installers/fuel/pod_config.yml.j2 | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 +index 99434f9..676ead3 100644 +--- a/config/installers/fuel/pod_config.yml.j2 ++++ b/config/installers/fuel/pod_config.yml.j2 +@@ -26,6 +26,13 @@ + parameters: + _param: + ++{%- if conf.idf is defined %} ++ opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }} ++ opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }} ++ opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }} ++ opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }} ++{%- endif %} ++ + opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }} + opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }} + opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }} diff --git a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch index adf07eb81..353854c1b 100644 --- a/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch +++ b/mcp/patches/reclass-system-salt-model/0001-Bring-in-opendaylight-support.patch @@ -3,30 +3,17 @@ Date: Thu, 29 Jun 2017 12:22:42 +0400 Subject: [PATCH] Bring in opendaylight support Change-Id: I3efec9a8b586a6c75b1c1635ad2a7024d73d9ad2 ---- - neutron/control/opendaylight/cluster.yml | 19 +++++++++++++++++++ - neutron/control/opendaylight/single.yml | 16 ++++++++++++++++ - neutron/gateway/opendaylight/single.yml | 8 ++++++++ - opendaylight/server/single.yml | 2 ++ - .../storage/system/opendaylight_control_single.yml | 13 +++++++++++++ - 5 files changed, 58 insertions(+) - create mode 100644 neutron/control/opendaylight/cluster.yml - create mode 100644 neutron/control/opendaylight/single.yml - create mode 100644 neutron/gateway/opendaylight/single.yml - create mode 100644 opendaylight/server/single.yml - create mode 100644 reclass/storage/system/opendaylight_control_single.yml diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml new file mode 100644 -index 0000000..4133650 +index 0000000..81dd5f9 --- /dev/null +++ b/neutron/control/opendaylight/cluster.yml -@@ -0,0 +1,19 @@ +@@ -0,0 +1,18 @@ +classes: +- service.keepalived.cluster.single +- service.haproxy.proxy.single +- service.neutron.control.cluster -+- system.haproxy.proxy.listen.openstack.neutron +- system.neutron.control.openvswitch.cluster +parameters: + neutron: diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml index daa89de66..b9bb4ad31 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml @@ -1,5 +1,7 @@ +--- parameters: _param: + # yamllint disable-line rule:line-length salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) @@ -12,3 +14,9 @@ parameters: # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} + + # Baremetal interface names (target nodes) + opnfv_baremetal_primary_nic: eth0 + opnfv_baremetal_secondary_nic: eth1 + opnfv_baremetal_tertiary_nic: eth2 # not used in current reclass model + opnfv_baremetal_quaternary_nic: eth3 # not used in current reclass model diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml index b8bde832e..295271d81 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml @@ -1,3 +1,4 @@ +--- classes: -- cluster.all-mcp-ocata-common.arch -- cluster.all-mcp-ocata-common.opnfv + - cluster.all-mcp-ocata-common.arch + - cluster.all-mcp-ocata-common.opnfv diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore index 4b9ab2b95..bf6a84be7 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/.gitignore @@ -1 +1,2 @@ runtime.yml +pod_config.yml diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml index 4cb4f2f8b..c9be2c2ab 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml @@ -1,3 +1,4 @@ +--- classes: -- cluster.all-mcp-ocata-common.opnfv.runtime -- cluster.all-mcp-ocata-common.opnfv.pod_config + - cluster.all-mcp-ocata-common.opnfv.runtime + - cluster.all-mcp-ocata-common.opnfv.pod_config diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml index b17816fe5..22c6ce624 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml @@ -1,92 +1,5 @@ +--- parameters: _param: - # infra service addresses - opnfv_infra_config_address: 10.167.4.100 - opnfv_infra_config_deploy_address: 10.20.0.2 - opnfv_infra_maas_node01_address: 10.167.4.3 - opnfv_infra_maas_node01_deploy_address: 192.168.11.3 - opnfv_infra_compute_node01_address: 10.167.4.141 - opnfv_infra_compute_node02_address: 10.167.4.142 - opnfv_infra_compute_node03_address: 10.167.4.143 - opnfv_infra_kvm_address: 10.167.4.140 - opnfv_infra_kvm_node01_address: 10.167.4.141 - opnfv_infra_kvm_node02_address: 10.167.4.142 - opnfv_infra_kvm_node03_address: 10.167.4.143 - - opnfv_openstack_gateway_node01_address: 10.167.4.124 - opnfv_openstack_gateway_node02_address: 10.167.4.125 - opnfv_openstack_gateway_node03_address: 10.167.4.126 - opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 - opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 - opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 - opnfv_openstack_proxy_address: 10.167.4.80 - opnfv_openstack_proxy_node01_address: 10.167.4.81 - opnfv_openstack_proxy_node02_address: 10.167.4.82 - opnfv_openstack_control_address: 10.167.4.10 - opnfv_openstack_control_node01_address: 10.167.4.11 - opnfv_openstack_control_node02_address: 10.167.4.12 - opnfv_openstack_control_node03_address: 10.167.4.13 - opnfv_openstack_database_address: 10.167.4.50 - opnfv_openstack_database_node01_address: 10.167.4.51 - opnfv_openstack_database_node02_address: 10.167.4.52 - opnfv_openstack_database_node03_address: 10.167.4.53 - opnfv_openstack_message_queue_address: 10.167.4.40 - opnfv_openstack_message_queue_node01_address: 10.167.4.41 - opnfv_openstack_message_queue_node02_address: 10.167.4.42 - opnfv_openstack_message_queue_node03_address: 10.167.4.43 - opnfv_openstack_telemetry_address: 10.167.4.75 - opnfv_openstack_telemetry_node01_address: 10.167.4.76 - opnfv_openstack_telemetry_node02_address: 10.167.4.77 - opnfv_openstack_telemetry_node03_address: 10.167.4.78 - opnfv_openstack_compute_node01_single_address: 10.167.4.101 - opnfv_openstack_compute_node02_single_address: 10.167.4.102 - opnfv_openstack_compute_node03_single_address: 10.167.4.103 - opnfv_openstack_compute_node01_control_address: 10.167.4.101 - opnfv_openstack_compute_node02_control_address: 10.167.4.102 - opnfv_openstack_compute_node03_control_address: 10.167.4.103 - opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 - opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 - opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 - opnfv_openstack_compute_node01_external_address: 172.30.10.2 - opnfv_openstack_compute_node02_external_address: 172.30.10.3 - - - opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] - opnfv_dns_server01: '8.8.8.8' - opnfv_net_mgmt_vlan: 300 - opnfv_net_tenant_vlan: 302 - - opnfv_maas_node01_architecture: amd64/generic - opnfv_maas_node01_power_address: 172.30.8.75 - opnfv_maas_node01_power_type: ipmi - opnfv_maas_node01_power_user: admin - opnfv_maas_node01_power_password: octopus - opnfv_maas_node01_interface_mac: "00:25:b5:a0:00:2a" - - opnfv_maas_node02_architecture: amd64/generic - opnfv_maas_node02_power_address: 172.30.8.65 - opnfv_maas_node02_power_type: ipmi - opnfv_maas_node02_power_user: admin - opnfv_maas_node02_power_password: octopus - opnfv_maas_node02_interface_mac: "00:25:b5:a0:00:3a" - - opnfv_maas_node03_architecture: amd64/generic - opnfv_maas_node03_power_address: 172.30.8.74 - opnfv_maas_node03_power_type: ipmi - opnfv_maas_node03_power_user: admin - opnfv_maas_node03_power_password: octopus - opnfv_maas_node03_interface_mac: "00:25:b5:a0:00:4a" - - opnfv_maas_node04_architecture: amd64/generic - opnfv_maas_node04_power_address: 172.30.8.73 - opnfv_maas_node04_power_type: ipmi - opnfv_maas_node04_power_user: admin - opnfv_maas_node04_power_password: octopus - opnfv_maas_node04_interface_mac: "00:25:b5:a0:00:5a" - - opnfv_maas_node05_architecture: amd64/generic - opnfv_maas_node05_power_address: 172.30.8.72 - opnfv_maas_node05_power_type: ipmi - opnfv_maas_node05_power_user: admin - opnfv_maas_node05_power_password: octopus - opnfv_maas_node05_interface_mac: "00:25:b5:a0:00:6a" + # NOTE: This file is overwritten at runtime by parsing the PDF. + opnfv_use_pod_descriptor_file: true diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example new file mode 100644 index 000000000..e77ad070e --- /dev/null +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml.example @@ -0,0 +1,93 @@ +--- +parameters: + _param: + + opnfv_infra_config_address: 10.167.4.100 + opnfv_infra_maas_node01_address: 10.167.4.3 + opnfv_infra_maas_node01_deploy_address: 192.168.11.3 + opnfv_infra_compute_node01_address: 10.167.4.141 + opnfv_infra_compute_node02_address: 10.167.4.142 + opnfv_infra_compute_node03_address: 10.167.4.143 + opnfv_infra_kvm_address: 10.167.4.140 + opnfv_infra_kvm_node01_address: 10.167.4.141 + opnfv_infra_kvm_node02_address: 10.167.4.142 + opnfv_infra_kvm_node03_address: 10.167.4.143 + + opnfv_openstack_gateway_node01_address: 10.167.4.124 + opnfv_openstack_gateway_node02_address: 10.167.4.125 + opnfv_openstack_gateway_node03_address: 10.167.4.126 + opnfv_openstack_gateway_node01_tenant_address: 10.1.0.6 + opnfv_openstack_gateway_node02_tenant_address: 10.1.0.7 + opnfv_openstack_gateway_node03_tenant_address: 10.1.0.9 + opnfv_openstack_proxy_address: 10.167.4.80 + opnfv_openstack_proxy_node01_address: 10.167.4.81 + opnfv_openstack_proxy_node02_address: 10.167.4.82 + opnfv_openstack_control_address: 10.167.4.10 + opnfv_openstack_control_node01_address: 10.167.4.11 + opnfv_openstack_control_node02_address: 10.167.4.12 + opnfv_openstack_control_node03_address: 10.167.4.13 + opnfv_openstack_database_address: 10.167.4.50 + opnfv_openstack_database_node01_address: 10.167.4.51 + opnfv_openstack_database_node02_address: 10.167.4.52 + opnfv_openstack_database_node03_address: 10.167.4.53 + opnfv_openstack_message_queue_address: 10.167.4.40 + opnfv_openstack_message_queue_node01_address: 10.167.4.41 + opnfv_openstack_message_queue_node02_address: 10.167.4.42 + opnfv_openstack_message_queue_node03_address: 10.167.4.43 + opnfv_openstack_telemetry_address: 10.167.4.75 + opnfv_openstack_telemetry_node01_address: 10.167.4.76 + opnfv_openstack_telemetry_node02_address: 10.167.4.77 + opnfv_openstack_telemetry_node03_address: 10.167.4.78 + opnfv_openstack_compute_node01_single_address: 10.167.4.101 + opnfv_openstack_compute_node02_single_address: 10.167.4.102 + opnfv_openstack_compute_node03_single_address: 10.167.4.103 + opnfv_openstack_compute_node01_control_address: 10.167.4.101 + opnfv_openstack_compute_node02_control_address: 10.167.4.102 + opnfv_openstack_compute_node03_control_address: 10.167.4.103 + opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 + opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 + opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 + opnfv_openstack_compute_node01_external_address: 172.30.10.2 + opnfv_openstack_compute_node02_external_address: 172.30.10.3 + + opnfv_opendaylight_server_node01_single_address: 10.167.4.111 + + opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] + opnfv_dns_server01: '8.8.8.8' + opnfv_net_mgmt_vlan: 300 + opnfv_net_tenant_vlan: 1000 + + opnfv_maas_node01_architecture: 'amd64/generic' + opnfv_maas_node01_power_address: 172.30.8.75 + opnfv_maas_node01_power_type: ipmi + opnfv_maas_node01_power_user: admin + opnfv_maas_node01_power_password: octopus + opnfv_maas_node01_interface_mac: '00:25:b5:a0:00:2a' + + opnfv_maas_node02_architecture: 'amd64/generic' + opnfv_maas_node02_power_address: 172.30.8.65 + opnfv_maas_node02_power_type: ipmi + opnfv_maas_node02_power_user: admin + opnfv_maas_node02_power_password: octopus + opnfv_maas_node02_interface_mac: '00:25:b5:a0:00:3a' + + opnfv_maas_node03_architecture: 'amd64/generic' + opnfv_maas_node03_power_address: 172.30.8.74 + opnfv_maas_node03_power_type: ipmi + opnfv_maas_node03_power_user: admin + opnfv_maas_node03_power_password: octopus + opnfv_maas_node03_interface_mac: '00:25:b5:a0:00:4a' + + opnfv_maas_node04_architecture: 'amd64/generic' + opnfv_maas_node04_power_address: 172.30.8.73 + opnfv_maas_node04_power_type: ipmi + opnfv_maas_node04_power_user: admin + opnfv_maas_node04_power_password: octopus + opnfv_maas_node04_interface_mac: '00:25:b5:a0:00:5a' + + opnfv_maas_node05_architecture: 'amd64/generic' + opnfv_maas_node05_power_address: 172.30.8.72 + opnfv_maas_node05_power_type: ipmi + opnfv_maas_node05_power_user: admin + opnfv_maas_node05_power_password: octopus + opnfv_maas_node05_interface_mac: '00:25:b5:a0:00:6a' diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template index b07ae13bd..1488da271 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template @@ -1,9 +1,10 @@ parameters: _param: reclass_config_master: ${SALT_MASTER} - opnfv_maas_mcp_address: ${MAAS_IP} - opnfv_maas_pxe_network: ${MAAS_PXE_NETWORK} - opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK_ROOTSTR}.3 - opnfv_maas_pxe_iprange_start: ${MAAS_PXE_NETWORK_ROOTSTR}.5 - opnfv_maas_pxe_iprange_end: ${MAAS_PXE_NETWORK_ROOTSTR}.250 + + # These should be moved to pod_config.yml and read based on PDF admin net + opnfv_maas_pxe_network_address: ${MAAS_PXE_NETWORK} + opnfv_maas_pxe_address: ${MAAS_PXE_NETWORK%.*}.3 + opnfv_maas_pxe_start_address: ${MAAS_PXE_NETWORK%.*}.5 + opnfv_maas_pxe_end_address: ${MAAS_PXE_NETWORK%.*}.250 diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml index 669eb7dc4..72a1e5be1 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml @@ -1,5 +1,7 @@ +--- parameters: _param: + # yamllint disable-line rule:line-length salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) @@ -12,3 +14,9 @@ parameters: # NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ opnfv_vcp_vm_primary_interface: ens2 opnfv_vcp_vm_secondary_interface: ens3 + + # Baremetal interface names (target nodes) + opnfv_baremetal_primary_nic: enp6s0 + opnfv_baremetal_secondary_nic: enp7s0 + opnfv_baremetal_tertiary_nic: enp8s0 + opnfv_baremetal_quaternary_nic: enp9s0 # not used in current reclass model diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml index e63e9d5c9..7c43c2fbb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml @@ -1,3 +1,4 @@ +--- parameters: _param: haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 @@ -8,159 +9,159 @@ parameters: type: openstack-service service_name: cinder binds: - - address: ${_param:cluster_vip_address} - port: 8776 + - address: ${_param:cluster_vip_address} + port: 8776 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8776 + params: ${_param:haproxy_check} glance_api: type: openstack-service service_name: glance binds: - - address: ${_param:cluster_vip_address} - port: 9292 + - address: ${_param:cluster_vip_address} + port: 9292 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9292 + params: ${_param:haproxy_check} glance_registry_api: type: general-service service_name: glance binds: - - address: ${_param:cluster_vip_address} - port: 9191 + - address: ${_param:cluster_vip_address} + port: 9191 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9191 + params: ${_param:haproxy_check} glare: type: general-service service_name: glare binds: - - address: ${_param:cluster_vip_address} - port: 9494 + - address: ${_param:cluster_vip_address} + port: 9494 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9494 + params: ${_param:haproxy_check} heat_cloudwatch_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8003 + - address: ${_param:cluster_vip_address} + port: 8003 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8003 + params: ${_param:haproxy_check} heat_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8004 + - address: ${_param:cluster_vip_address} + port: 8004 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8004 + params: ${_param:haproxy_check} heat_cfn_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8000 + - address: ${_param:cluster_vip_address} + port: 8000 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8000 + params: ${_param:haproxy_check} keystone_public_api: type: openstack-service service_name: keystone binds: - - address: ${_param:cluster_vip_address} - port: 5000 + - address: ${_param:cluster_vip_address} + port: 5000 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 5000 + params: ${_param:haproxy_check} keystone_admin_api: type: openstack-service service_name: keystone binds: - - address: ${_param:cluster_vip_address} - port: 35357 + - address: ${_param:cluster_vip_address} + port: 35357 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 35357 + params: ${_param:haproxy_check} neutron_api: type: openstack-service service_name: neutron binds: - - address: ${_param:cluster_vip_address} - port: 9696 + - address: ${_param:cluster_vip_address} + port: 9696 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9696 + params: ${_param:haproxy_check} nova_placement_api: mode: http binds: - - address: ${_param:cluster_vip_address} - port: 8778 + - address: ${_param:cluster_vip_address} + port: 8778 options: - - httpclose - - httplog + - httpclose + - httplog health-check: http: options: - - expect status 401 + - expect status 401 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8778 + params: ${_param:haproxy_check} nova_ec2_api: type: general-service service_name: nova check: false binds: - - address: ${_param:cluster_vip_address} - port: 8773 + - address: ${_param:cluster_vip_address} + port: 8773 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8773 + params: ${_param:haproxy_check} nova_api: type: openstack-service service_name: nova binds: - - address: ${_param:cluster_vip_address} - port: 8774 + - address: ${_param:cluster_vip_address} + port: 8774 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8774 + params: ${_param:haproxy_check} nova_metadata_api: type: openstack-service binds: - - address: ${_param:cluster_vip_address} - port: 8775 + - address: ${_param:cluster_vip_address} + port: 8775 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8775 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 3f72e182f..33f2804e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -1,40 +1,43 @@ +--- classes: -- service.git.client -- system.linux.system.single -- system.linux.system.repo.mcp.salt -- system.linux.system.repo.saltstack.xenial -- system.salt.master.api -- system.salt.master.pkg -- system.salt.minion.ca.salt_master -- system.reclass.storage.salt -- system.reclass.storage.system.physical_control_cluster -- system.reclass.storage.system.openstack_control_cluster -- system.reclass.storage.system.openstack_proxy_cluster -- system.reclass.storage.system.openstack_database_cluster -- system.reclass.storage.system.openstack_message_queue_cluster -- system.reclass.storage.system.opendaylight_control_single -- system.reclass.storage.system.openstack_telemetry_cluster -# - system.reclass.storage.system.stacklight_log_cluster -# - system.reclass.storage.system.stacklight_monitor_cluster -# - system.reclass.storage.system.stacklight_telemetry_cluster -- system.reclass.storage.system.infra_maas_single -- cluster.baremetal-mcp-ocata-odl-ha.infra + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.linux.system.repo.saltstack.xenial + - system.salt.master.api + - system.salt.master.pkg + - system.salt.minion.ca.salt_master + - system.reclass.storage.salt + - system.reclass.storage.system.physical_control_cluster + - system.reclass.storage.system.openstack_control_cluster + - system.reclass.storage.system.openstack_proxy_cluster + - system.reclass.storage.system.openstack_database_cluster + - system.reclass.storage.system.openstack_message_queue_cluster + - system.reclass.storage.system.opendaylight_control_single + - system.reclass.storage.system.openstack_telemetry_cluster + # - system.reclass.storage.system.stacklight_log_cluster + # - system.reclass.storage.system.stacklight_monitor_cluster + # - system.reclass.storage.system.stacklight_telemetry_cluster + - system.reclass.storage.system.infra_maas_single + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: salt_master_base_environment: prd reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master - reclass_config_master: ${_param:infra_config_deploy_address} single_address: ${_param:infra_config_address} deploy_address: ${_param:infra_config_deploy_address} salt_master_host: ${_param:infra_config_deploy_address} + # yamllint disable rule:line-length salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode @@ -80,16 +83,16 @@ parameters: openstack_proxy_node02: params: linux_system_codename: xenial -# stacklight_log_node01: -# classes: -# - system.elasticsearch.client.single -# stacklight_monitor_node01: -# classes: -# - system.grafana.client.single -# - system.kibana.client.single + # stacklight_log_node01: + # classes: + # - system.elasticsearch.client.single + # stacklight_monitor_node01: + # classes: + # - system.grafana.client.single + # - system.kibana.client.single openstack_control_node01: classes: - - cluster.${_param:cluster_name}.openstack.control_init + - cluster.${_param:cluster_name}.openstack.control_init params: linux_system_codename: xenial openstack_control_node02: @@ -100,7 +103,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.${_param:cluster_name}.openstack.database_init + - cluster.${_param:cluster_name}.openstack.database_init params: linux_system_codename: xenial openstack_database_node02: @@ -113,7 +116,7 @@ parameters: name: ${_param:openstack_compute_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -125,7 +128,7 @@ parameters: name: ${_param:openstack_compute_node02_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -135,7 +138,7 @@ parameters: external_address: ${_param:openstack_compute_node02_external_address} opendaylight_control_node01: classes: - - cluster.${_param:cluster_name}.opendaylight.control + - cluster.${_param:cluster_name}.opendaylight.control params: linux_system_codename: xenial single_address: ${_param:opendaylight_server_node01_single_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index 29b25216e..4f8f87a2b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -1,34 +1,36 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-odl-ha.openstack -# - cluster.baremetal-mcp-ocata-odl-ha.stacklight -# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-odl-ha.openstack + # - cluster.baremetal-mcp-ocata-odl-ha.stacklight + # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 + salt_version: 2016.11 cluster_name: baremetal-mcp-ocata-odl-ha cluster_domain: ${_param:cluster_name}.local -# stacklight_environment: ${_param:cluster_domain} + # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master cluster_public_host: ${_param:openstack_proxy_address} infra_config_hostname: cfg01 infra_maas_database_password: opnfv_secret # infra service addresses - infra_config_address: 10.167.4.100 - infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 + infra_config_address: ${_param:opnfv_infra_config_address} + infra_config_deploy_address: ${_param:reclass_config_master} + infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} - infra_compute_node01_address: 10.167.4.141 - infra_compute_node02_address: 10.167.4.142 - infra_compute_node03_address: 10.167.4.143 + infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address} + infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address} + infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address} - infra_kvm_address: 10.167.4.140 - infra_kvm_node01_address: 10.167.4.141 - infra_kvm_node02_address: 10.167.4.142 - infra_kvm_node03_address: 10.167.4.143 + infra_kvm_address: ${_param:opnfv_infra_kvm_address} + infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address} + infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address} + infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address} infra_maas_node01_hostname: mas01 infra_kvm_node01_hostname: kvm01 @@ -43,17 +45,22 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 + # yamllint disable-line rule:line-length salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: system: @@ -67,30 +74,30 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - ${_param:infra_config_hostname} - - ${_param:infra_config_hostname}.${_param:cluster_domain} + - ${_param:infra_config_hostname} + - ${_param:infra_config_hostname}.${_param:cluster_domain} mas01: address: ${_param:infra_maas_node01_address} names: - - ${_param:infra_maas_node01_hostname} - - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_maas_node01_hostname} + - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} kvm01: address: ${_param:infra_kvm_node01_address} names: - - ${_param:infra_kvm_node01_hostname} - - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node01_hostname} + - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} kvm02: address: ${_param:infra_kvm_node02_address} names: - - ${_param:infra_kvm_node02_hostname} - - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node02_hostname} + - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} kvm03: address: ${_param:infra_kvm_node03_address} names: - - ${_param:infra_kvm_node03_hostname} - - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node03_hostname} + - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index e55bcbf25..c9b3bc1e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -1,21 +1,21 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- service.keepalived.cluster.single -- system.glusterfs.server.volume.glance -- system.glusterfs.server.volume.keystone -- system.glusterfs.server.cluster -- system.salt.control.virt -- system.salt.control.cluster.openstack_control_cluster -- system.salt.control.cluster.openstack_proxy_cluster -- system.salt.control.cluster.openstack_database_cluster -- system.salt.control.cluster.openstack_message_queue_cluster -- system.salt.control.cluster.openstack_telemetry_cluster -# - system.salt.control.cluster.stacklight_server_cluster -# - system.salt.control.cluster.stacklight_log_cluster -# - system.salt.control.cluster.stacklight_telemetry_cluster -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - service.keepalived.cluster.single + - system.glusterfs.server.volume.glance + - system.glusterfs.server.volume.keystone + - system.glusterfs.server.cluster + - system.salt.control.virt + - system.salt.control.cluster.openstack_control_cluster + - system.salt.control.cluster.openstack_proxy_cluster + - system.salt.control.cluster.openstack_database_cluster + - system.salt.control.cluster.openstack_message_queue_cluster + - system.salt.control.cluster.openstack_telemetry_cluster + # - system.salt.control.cluster.stacklight_server_cluster + # - system.salt.control.cluster.stacklight_log_cluster + # - system.salt.control.cluster.stacklight_telemetry_cluster + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: linux_system_codename: xenial @@ -25,11 +25,11 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: enp6s0 + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: - size: #RAM 4096,8192,16384,32768,65536 - ##Default production sizing + size: # RAM 4096,8192,16384,32768,65536 + # Default production sizing openstack.control: cpu: 4 ram: 12288 @@ -55,21 +55,21 @@ parameters: ram: 2048 disk_profile: small net_profile: default -# stacklight.log: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default -# stacklight.server: -# cpu: 2 -# ram: 4096 -# disk_profile: small -# net_profile: default -# stacklight.telemetry: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default + # stacklight.log: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default + # stacklight.server: + # cpu: 2 + # ram: 4096 + # disk_profile: small + # net_profile: default + # stacklight.telemetry: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default opendaylight.server: cpu: 4 ram: 6144 @@ -80,6 +80,7 @@ parameters: node: odl01: name: ${_param:opendaylight_server_node01_hostname} + # yamllint disable-line rule:line-length provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} image: ${_param:salt_control_xenial_image} size: opendaylight.server @@ -131,15 +132,15 @@ parameters: - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On + cluster.readdir-optimize: 'On' + nfs.disable: 'On' + network.remote-dio: 'On' diagnostics.client-log-level: WARNING diagnostics.brick-log-level: WARNING linux: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual @@ -151,19 +152,17 @@ parameters: enabled: true proto: dhcp type: bridge - name_servers: - - 8.8.8.8 - - 8.8.4.4 + name_servers: ${_param:opnfv_name_servers} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} noifupdown: true - vlan300: + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:deploy_nic}.300 + name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} br-ctl: enabled: true type: bridge @@ -171,4 +170,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:deploy_nic}.300 + - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml index 64ae85a38..260da225d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -1,12 +1,13 @@ +--- classes: -- system.linux.system.repo.saltstack.xenial -- system.maas.region.single -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.maas.region.single + - service.maas.cluster.single + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - dhcp_interface: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface} interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -14,7 +15,7 @@ parameters: maas_admin_username: opnfv maas_admin_password: opnfv_secret maas_db_password: opnfv_secret - dns_server01: 8.8.4.4 + dns_server01: ${_param:opnfv_dns_server01} single_address: ${_param:infra_maas_node01_deploy_address} maas: region: @@ -32,12 +33,12 @@ parameters: default_min_hwe_kernel: 'hwe-16.04' subnets: opnfv_maas_pxe: - name: ${_param:opnfv_maas_pxe_network}/24 - cidr: ${_param:opnfv_maas_pxe_network}/24 + name: ${_param:opnfv_maas_pxe_network_address}/24 + cidr: ${_param:opnfv_maas_pxe_network_address}/24 gateway_ip: ${_param:single_address} iprange: - start: ${_param:opnfv_maas_pxe_iprange_start} - end: ${_param:opnfv_maas_pxe_iprange_end} + start: ${_param:opnfv_maas_pxe_start_address} + end: ${_param:opnfv_maas_pxe_end_address} type: dynamic vlans: untagged: @@ -47,57 +48,57 @@ parameters: machines: kvm01: interface: - mac: "00:25:b5:a0:00:2a" + mac: ${_param:opnfv_maas_node01_interface_mac} power_parameters: - power_address: "172.30.8.75" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node01_power_address} + power_password: ${_param:opnfv_maas_node01_power_password} + power_type: ${_param:opnfv_maas_node01_power_type} + power_user: ${_param:opnfv_maas_node01_power_user} + architecture: ${_param:opnfv_maas_node01_architecture} distro_series: xenial hwe_kernel: hwe-16.04 kvm02: interface: - mac: "00:25:b5:a0:00:3a" + mac: ${_param:opnfv_maas_node02_interface_mac} power_parameters: - power_address: "172.30.8.65" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node02_power_address} + power_password: ${_param:opnfv_maas_node02_power_password} + power_type: ${_param:opnfv_maas_node02_power_type} + power_user: ${_param:opnfv_maas_node02_power_user} + architecture: ${_param:opnfv_maas_node02_architecture} distro_series: xenial hwe_kernel: hwe-16.04 kvm03: interface: - mac: "00:25:b5:a0:00:4a" + mac: ${_param:opnfv_maas_node03_interface_mac} power_parameters: - power_address: "172.30.8.74" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node03_power_address} + power_password: ${_param:opnfv_maas_node03_power_password} + power_type: ${_param:opnfv_maas_node03_power_type} + power_user: ${_param:opnfv_maas_node03_power_user} + architecture: ${_param:opnfv_maas_node03_architecture} distro_series: xenial hwe_kernel: hwe-16.04 cmp001: interface: - mac: "00:25:b5:a0:00:5a" + mac: ${_param:opnfv_maas_node04_interface_mac} power_parameters: - power_address: "172.30.8.73" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node04_power_address} + power_password: ${_param:opnfv_maas_node04_power_password} + power_type: ${_param:opnfv_maas_node04_power_type} + power_user: ${_param:opnfv_maas_node04_power_user} + architecture: ${_param:opnfv_maas_node04_architecture} distro_series: xenial hwe_kernel: hwe-16.04 cmp002: interface: - mac: "00:25:b5:a0:00:6a" + mac: ${_param:opnfv_maas_node05_interface_mac} power_parameters: - power_address: "172.30.8.72" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node05_power_address} + power_password: ${_param:opnfv_maas_node05_power_password} + power_type: ${_param:opnfv_maas_node05_power_type} + power_user: ${_param:opnfv_maas_node05_power_user} + architecture: ${_param:opnfv_maas_node05_architecture} distro_series: xenial hwe_kernel: hwe-16.04 linux: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml index b2c795fdd..2c347131d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml @@ -1,4 +1,5 @@ +--- classes: -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-odl-ha.infra -- cluster.baremetal-mcp-ocata-odl-ha.openstack + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-ocata-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml index 0a01af746..b68eb3db5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml @@ -1,21 +1,16 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.opendaylight.server.single -- cluster.baremetal-mcp-ocata-odl-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.opendaylight.server.single + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: linux_system_codename: xenial linux: network: interface: - ens3: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 + single: ${_param:linux_single_interface} opendaylight: server: odl_bind_ip: ${_param:single_address} @@ -28,5 +23,6 @@ parameters: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + - odl-mdsal-apidocs netvirt: - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml index b7f9f3fe7..758fa3ffc 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml @@ -1,8 +1,12 @@ +--- classes: -- cluster.baremetal-mcp-ocata-odl-ha + - cluster.baremetal-mcp-ocata-odl-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index d2495c26a..032dd8452 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.glusterfs.client.cluster -- system.nova.compute.cluster -- system.nova.compute.nfv.hugepages -- system.nova.compute.nfv.cpu_pinning -- system.neutron.gateway.opendaylight.single -- system.neutron.gateway.cluster -- system.cinder.volume.single -- system.cinder.volume.backend.lvm -- system.ceilometer.agent.cluster -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.storage.loopback + - system.glusterfs.client.cluster + - system.nova.compute.cluster + - system.nova.compute.nfv.hugepages + - system.nova.compute.nfv.cpu_pinning + - system.neutron.gateway.opendaylight.single + - system.neutron.gateway.cluster + - system.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: cluster_vip_address: ${_param:openstack_control_address} @@ -24,17 +24,17 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - tenant_nic: enp7s0 - linux_system_codename: xenial - external_nic: enp8s0 + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + tenant_nic: ${_param:opnfv_baremetal_secondary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 + linux_system_codename: xenial neutron_agents: - - neutron-dhcp-agent - - neutron-metadata-agent + - neutron-dhcp-agent + - neutron-metadata-agent opendaylight: client: ovsdb_server_iface: ptcp:6639:127.0.0.1 @@ -56,6 +56,7 @@ parameters: server: ${_param:glusterfs_service_host} user: nova group: nova + # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: system: @@ -89,21 +90,21 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - ${_param:tenant_nic}.302 - vlan300: + - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:mgmt_nic}.300 + name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:mgmt_nic} - vlan302: + - ${_param:mgmt_nic} + tenant-vlan: enabled: true proto: manual type: vlan - name: ${_param:tenant_nic}.302 + name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} use_interfaces: - - ${_param:tenant_nic} + - ${_param:tenant_nic} br-ctl: enabled: true type: bridge @@ -111,7 +112,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.300 + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge @@ -128,7 +129,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_nic} + - ${_param:external_nic} use_ovs_ports: - - float-to-ex - + - float-to-ex diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml index b46e23da7..9da1f03da 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml @@ -1,29 +1,29 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.ceilometer.client -- system.memcached.server.single -- system.keystone.server.cluster -- system.keystone.server.wsgi -- system.glance.control.cluster -- system.neutron.control.opendaylight.cluster -- system.nova.control.cluster -- system.cinder.control.cluster -- system.cinder.control.backend.lvm -- system.heat.server.cluster -- system.designate.server.cluster -- system.designate.server.backend.bind -- system.bind.server.single -- system.haproxy.proxy.listen.openstack.nova-placement -- system.haproxy.proxy.listen.openstack.glare -- system.glusterfs.client.cluster -- system.glusterfs.client.volume.glance -- system.glusterfs.client.volume.keystone -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.ceilometer.client + - system.memcached.server.single + - system.keystone.server.cluster + - system.keystone.server.wsgi + - system.glance.control.cluster + - system.neutron.control.opendaylight.cluster + - system.nova.control.cluster + - system.cinder.control.cluster + - system.cinder.control.backend.lvm + - system.heat.server.cluster + - system.designate.server.cluster + - system.designate.server.backend.bind + - system.bind.server.single + - system.haproxy.proxy.listen.openstack.nova-placement + - system.haproxy.proxy.listen.openstack.glare + - system.glusterfs.client.cluster + - system.glusterfs.client.volume.glance + - system.glusterfs.client.volume.keystone + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -37,8 +37,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml index e759c0c8d..79c387940 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.keystone.client.single -- system.keystone.client.service.aodh -- system.keystone.client.service.ceilometer -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 -- system.keystone.client.service.designate + - system.keystone.client.single + - system.keystone.client.service.aodh + - system.keystone.client.service.ceilometer + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.designate diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml index 9748c4cd4..e70aab514 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml @@ -1,11 +1,12 @@ +--- classes: -- system.horizon.server.single -- cluster.baremetal-mcp-ocata-odl-ha + - system.horizon.server.single + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: horizon_site_branding: OpenStack Dashboard linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml index e61a4699f..fc783d1b4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml @@ -1,22 +1,22 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.galera.server.cluster -- system.galera.server.database.aodh -- system.galera.server.database.ceilometer -- system.galera.server.database.cinder -- system.galera.server.database.designate -- system.galera.server.database.glance -- system.galera.server.database.grafana -- system.galera.server.database.heat -- system.galera.server.database.keystone -- system.galera.server.database.nova -- system.galera.server.database.neutron -- cluster.baremetal-mcp-ocata-odl-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.galera.server.cluster + - system.galera.server.database.aodh + - system.galera.server.database.ceilometer + - system.galera.server.database.cinder + - system.galera.server.database.designate + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.neutron + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml index b16f05593..5dcb9c9e1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml @@ -1,2 +1,3 @@ +--- classes: -- system.mysql.client.single + - system.mysql.client.single diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml index e49a2052d..c7df472d3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml @@ -1,34 +1,36 @@ +--- +# yamllint disable rule:line-length parameters: _param: openstack_version: ocata - openstack_gateway_node01_address: 10.167.4.124 - openstack_gateway_node02_address: 10.167.4.125 - openstack_gateway_node03_address: 10.167.4.126 - openstack_gateway_node01_tenant_address: 10.1.0.6 - openstack_gateway_node02_tenant_address: 10.1.0.7 - openstack_gateway_node03_tenant_address: 10.1.0.9 + openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address} + openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address} + openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address} + openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address} + openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address} openstack_gateway_node01_hostname: gtw01 openstack_gateway_node02_hostname: gtw02 openstack_gateway_node03_hostname: gtw03 # openstack service addresses - openstack_proxy_address: 10.167.4.80 - openstack_proxy_node01_address: 10.167.4.81 - openstack_proxy_node02_address: 10.167.4.82 - openstack_control_address: 10.167.4.10 - openstack_control_node01_address: 10.167.4.11 - openstack_control_node02_address: 10.167.4.12 - openstack_control_node03_address: 10.167.4.13 - openstack_database_address: 10.167.4.50 - openstack_database_node01_address: 10.167.4.51 - openstack_database_node02_address: 10.167.4.52 - openstack_database_node03_address: 10.167.4.53 - openstack_message_queue_address: 10.167.4.40 - openstack_message_queue_node01_address: 10.167.4.41 - openstack_message_queue_node02_address: 10.167.4.42 - openstack_message_queue_node03_address: 10.167.4.43 + openstack_proxy_address: ${_param:opnfv_openstack_proxy_address} + openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address} + openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address} + openstack_control_address: ${_param:opnfv_openstack_control_address} + openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} + openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} + openstack_database_address: ${_param:opnfv_openstack_database_address} + openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address} + openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address} + openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address} + openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address} + openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address} + openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address} + openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address} openstack_telemetry_hostname: mdb @@ -36,26 +38,26 @@ parameters: openstack_telemetry_node02_hostname: mdb02 openstack_telemetry_node03_hostname: mdb03 - openstack_telemetry_address: 10.167.4.75 - openstack_telemetry_node01_address: 10.167.4.76 - openstack_telemetry_node02_address: 10.167.4.77 - openstack_telemetry_node03_address: 10.167.4.78 + openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address} + openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address} + openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address} + openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address} # OpenStack Compute - openstack_compute_node01_single_address: 10.167.4.101 - openstack_compute_node02_single_address: 10.167.4.102 - openstack_compute_node03_single_address: 10.167.4.103 - openstack_compute_node01_control_address: 10.167.4.101 - openstack_compute_node02_control_address: 10.167.4.102 - openstack_compute_node03_control_address: 10.167.4.103 - openstack_compute_node01_tenant_address: 10.1.0.101 - openstack_compute_node02_tenant_address: 10.1.0.102 - openstack_compute_node03_tenant_address: 10.1.0.103 - openstack_compute_node01_external_address: 172.30.10.2 - openstack_compute_node02_external_address: 172.30.10.3 + openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address} + openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address} + openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address} + openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address} + openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address} + openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address} + openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address} + openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address} + openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address} + openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address} + openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address} # opendaylight options - opendaylight_server_node01_single_address: 10.167.4.111 + opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address} opendaylight_service_host: ${_param:opendaylight_server_node01_single_address} opendaylight_server_node01_hostname: odl01 opendaylight_router: odl-router_v2 @@ -83,17 +85,17 @@ parameters: openstack_region: RegionOne admin_email: root@localhost - ##Neutron osv/nodvr - neutron_control_dvr: False + # Neutron osv/nodvr + neutron_control_dvr: 'False' neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: True + neutron_l3_ha: 'True' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: True + neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -188,14 +190,14 @@ parameters: rndc_key_file: /etc/designate/rndc.key designate_version: ${_param:openstack_version} # Billing - #keystone_billometer_password: opnfv_secret - #keystone_billometer_address: ${_param:billometer_service_host} - #billometer_service_host: ${_param:openstack_billing_address} - #billometer_version: ${_param:openstack_version} - #billometer_secret_key: opnfv_secretpasswordpasswordpassword - #billometer_identity_password: ${_param:keystone_billometer_password} - #billometer_identity_host: ${_param:openstack_control_address} - #billometer_identity_token: ${_param:keystone_service_token} + # keystone_billometer_password: opnfv_secret + # keystone_billometer_address: ${_param:billometer_service_host} + # billometer_service_host: ${_param:openstack_billing_address} + # billometer_version: ${_param:openstack_version} + # billometer_secret_key: opnfv_secretpasswordpasswordpassword + # billometer_identity_password: ${_param:keystone_billometer_password} + # billometer_identity_host: ${_param:openstack_control_address} + # billometer_identity_token: ${_param:keystone_service_token} linux: system: repo: @@ -214,120 +216,120 @@ parameters: prx: address: ${_param:openstack_proxy_address} names: - - ${_param:openstack_proxy_hostname} - - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_hostname} + - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} prx01: address: ${_param:openstack_proxy_node01_address} names: - - ${_param:openstack_proxy_node01_hostname} - - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node01_hostname} + - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} prx02: address: ${_param:openstack_proxy_node02_address} names: - - ${_param:openstack_proxy_node02_hostname} - - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node02_hostname} + - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} ctl: address: ${_param:openstack_control_address} names: - - ${_param:openstack_control_hostname} - - ${_param:openstack_control_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_hostname} + - ${_param:openstack_control_hostname}.${_param:cluster_domain} ctl01: address: ${_param:openstack_control_node01_address} names: - - ${_param:openstack_control_node01_hostname} - - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node01_hostname} + - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} ctl02: address: ${_param:openstack_control_node02_address} names: - - ${_param:openstack_control_node02_hostname} - - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node02_hostname} + - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} ctl03: address: ${_param:openstack_control_node03_address} names: - - ${_param:openstack_control_node03_hostname} - - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node03_hostname} + - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} msg: address: ${_param:openstack_message_queue_address} names: - - ${_param:openstack_message_queue_hostname} - - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_hostname} + - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} msg01: address: ${_param:openstack_message_queue_node01_address} names: - - ${_param:openstack_message_queue_node01_hostname} - - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node01_hostname} + - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} msg02: address: ${_param:openstack_message_queue_node02_address} names: - - ${_param:openstack_message_queue_node02_hostname} - - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node02_hostname} + - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} msg03: address: ${_param:openstack_message_queue_node03_address} names: - - ${_param:openstack_message_queue_node03_hostname} - - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node03_hostname} + - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} dbs: address: ${_param:openstack_database_address} names: - - ${_param:openstack_database_hostname} - - ${_param:openstack_database_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_hostname} + - ${_param:openstack_database_hostname}.${_param:cluster_domain} dbs01: address: ${_param:openstack_database_node01_address} names: - - ${_param:openstack_database_node01_hostname} - - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node01_hostname} + - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} dbs02: address: ${_param:openstack_database_node02_address} names: - - ${_param:openstack_database_node02_hostname} - - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node02_hostname} + - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} dbs03: address: ${_param:openstack_database_node03_address} names: - - ${_param:openstack_database_node03_hostname} - - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node03_hostname} + - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} mdb: address: ${_param:openstack_telemetry_address} names: - - ${_param:openstack_telemetry_hostname} - - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_hostname} + - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} mdb01: address: ${_param:openstack_telemetry_node01_address} names: - - ${_param:openstack_telemetry_node01_hostname} - - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node01_hostname} + - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} mdb02: address: ${_param:openstack_telemetry_node02_address} names: - - ${_param:openstack_telemetry_node02_hostname} - - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node02_hostname} + - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} mdb03: address: ${_param:openstack_telemetry_node03_address} names: - - ${_param:openstack_telemetry_node03_hostname} - - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node03_hostname} + - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} cmp001: address: ${_param:openstack_compute_node01_control_address} names: - - ${_param:openstack_compute_node01_hostname} - - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node01_hostname} + - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} cmp002: address: ${_param:openstack_compute_node02_control_address} names: - - ${_param:openstack_compute_node02_hostname} - - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} -# gtw01: -# address: ${_param:openstack_gateway_node01_address} -# names: -# - ${_param:openstack_gateway_node01_hostname} -# - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain} -# gtw02: -# address: ${_param:openstack_gateway_node02_address} -# names: -# - ${_param:openstack_gateway_node02_hostname} -# - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node02_hostname} + - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} + # gtw01: + # address: ${_param:openstack_gateway_node01_address} + # names: + # - ${_param:openstack_gateway_node01_hostname} + # - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain} + # gtw02: + # address: ${_param:openstack_gateway_node02_address} + # names: + # - ${_param:openstack_gateway_node02_hostname} + # - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} odl01: address: ${_param:opendaylight_service_host} names: - - ${_param:opendaylight_server_node01_hostname} - - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain} + - ${_param:opendaylight_server_node01_hostname} + - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml index f5312c1da..f740e2904 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml @@ -1,13 +1,13 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.rabbitmq.server.cluster -- system.rabbitmq.server.vhost.openstack -- cluster.baremetal-mcp-ocata-odl-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.rabbitmq.server.cluster + - system.rabbitmq.server.vhost.openstack + - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml index 89a193061..83a4be3fb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml @@ -1,23 +1,23 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.nginx.server.single -- system.nginx.server.proxy.openstack_api -- system.nginx.server.proxy.openstack_vnc -- system.nginx.server.proxy.openstack_web -- system.nginx.server.proxy.openstack.aodh -- system.nginx.server.proxy.openstack.ceilometer -- system.horizon.server.single -- system.salt.minion.cert.proxy -- system.sphinx.server.doc.reclass -- service.keepalived.cluster.single -- cluster.baremetal-mcp-ocata-odl-ha.infra -- cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard -# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.nginx.server.single + - system.nginx.server.proxy.openstack_api + - system.nginx.server.proxy.openstack_vnc + - system.nginx.server.proxy.openstack_web + - system.nginx.server.proxy.openstack.aodh + - system.nginx.server.proxy.openstack.ceilometer + - system.horizon.server.single + - system.salt.minion.cert.proxy + - system.sphinx.server.doc.reclass + - service.keepalived.cluster.single + - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard + # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml index 4e900908b..4b14f7beb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.mongodb.server.cluster -- system.mongodb.server.database.ceilometer -- system.ceilometer.server.backend.mongodb -# - system.ceilometer.server.backend.influxdb -# - system.heka.ceilometer_collector.single -- system.ceilometer.server.cluster -- system.aodh.server.cluster -- cluster.baremetal-mcp-ocata-odl-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.mongodb.server.cluster + - system.mongodb.server.database.ceilometer + - system.ceilometer.server.backend.mongodb + # - system.ceilometer.server.backend.influxdb + # - system.heka.ceilometer_collector.single + - system.ceilometer.server.cluster + - system.aodh.server.cluster + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml index 5ac2277dd..cd7083040 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml @@ -1,39 +1,42 @@ +--- classes: -- service.git.client -- system.linux.system.single -- system.linux.system.repo.mcp.salt -- system.linux.system.repo.saltstack.xenial -- system.salt.master.api -- system.salt.master.pkg -- system.salt.minion.ca.salt_master -- system.reclass.storage.salt -- system.reclass.storage.system.physical_control_cluster -- system.reclass.storage.system.openstack_control_cluster -- system.reclass.storage.system.openstack_proxy_cluster -- system.reclass.storage.system.openstack_database_cluster -- system.reclass.storage.system.openstack_message_queue_cluster -- system.reclass.storage.system.openstack_telemetry_cluster -# - system.reclass.storage.system.stacklight_log_cluster -# - system.reclass.storage.system.stacklight_monitor_cluster -# - system.reclass.storage.system.stacklight_telemetry_cluster -- system.reclass.storage.system.infra_maas_single -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.linux.system.repo.saltstack.xenial + - system.salt.master.api + - system.salt.master.pkg + - system.salt.minion.ca.salt_master + - system.reclass.storage.salt + - system.reclass.storage.system.physical_control_cluster + - system.reclass.storage.system.openstack_control_cluster + - system.reclass.storage.system.openstack_proxy_cluster + - system.reclass.storage.system.openstack_database_cluster + - system.reclass.storage.system.openstack_message_queue_cluster + - system.reclass.storage.system.openstack_telemetry_cluster + # - system.reclass.storage.system.stacklight_log_cluster + # - system.reclass.storage.system.stacklight_monitor_cluster + # - system.reclass.storage.system.stacklight_telemetry_cluster + - system.reclass.storage.system.infra_maas_single + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: salt_master_base_environment: prd reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master - reclass_config_master: ${_param:infra_config_deploy_address} single_address: ${_param:infra_config_address} deploy_address: ${_param:infra_config_deploy_address} salt_master_host: ${_param:infra_config_deploy_address} + # yamllint disable rule:line-length salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode @@ -79,16 +82,16 @@ parameters: openstack_proxy_node02: params: linux_system_codename: xenial -# stacklight_log_node01: -# classes: -# - system.elasticsearch.client.single -# stacklight_monitor_node01: -# classes: -# - system.grafana.client.single -# - system.kibana.client.single + # stacklight_log_node01: + # classes: + # - system.elasticsearch.client.single + # stacklight_monitor_node01: + # classes: + # - system.grafana.client.single + # - system.kibana.client.single openstack_control_node01: classes: - - cluster.${_param:cluster_name}.openstack.control_init + - cluster.${_param:cluster_name}.openstack.control_init params: linux_system_codename: xenial openstack_control_node02: @@ -99,7 +102,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.${_param:cluster_name}.openstack.database_init + - cluster.${_param:cluster_name}.openstack.database_init params: linux_system_codename: xenial openstack_database_node02: @@ -112,7 +115,7 @@ parameters: name: ${_param:openstack_compute_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -126,7 +129,7 @@ parameters: name: ${_param:openstack_compute_node02_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 60b615b11..f68d48452 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -1,34 +1,36 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack -# - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight -# - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.client + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack + # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight + # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.client parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 + salt_version: 2016.11 cluster_name: baremetal-mcp-ocata-ovs-dpdk-ha cluster_domain: ${_param:cluster_name}.local -# stacklight_environment: ${_param:cluster_domain} + # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master cluster_public_host: ${_param:openstack_proxy_address} infra_config_hostname: cfg01 infra_maas_database_password: opnfv_secret # infra service addresses - infra_config_address: 10.167.4.100 - infra_config_deploy_address: 10.20.0.2 - infra_maas_node01_address: 10.167.4.3 + infra_config_address: ${_param:opnfv_infra_config_address} + infra_config_deploy_address: ${_param:reclass_config_master} + infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} - infra_compute_node01_address: 10.167.4.141 - infra_compute_node02_address: 10.167.4.142 - infra_compute_node03_address: 10.167.4.143 + infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address} + infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address} + infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address} - infra_kvm_address: 10.167.4.140 - infra_kvm_node01_address: 10.167.4.141 - infra_kvm_node02_address: 10.167.4.142 - infra_kvm_node03_address: 10.167.4.143 + infra_kvm_address: ${_param:opnfv_infra_kvm_address} + infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address} + infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address} + infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address} infra_maas_node01_hostname: mas01 infra_kvm_node01_hostname: kvm01 @@ -43,17 +45,22 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 + # yamllint disable-line rule:line-length salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: system: @@ -70,30 +77,30 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - ${_param:infra_config_hostname} - - ${_param:infra_config_hostname}.${_param:cluster_domain} + - ${_param:infra_config_hostname} + - ${_param:infra_config_hostname}.${_param:cluster_domain} mas01: address: ${_param:infra_maas_node01_address} names: - - ${_param:infra_maas_node01_hostname} - - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_maas_node01_hostname} + - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} kvm01: address: ${_param:infra_kvm_node01_address} names: - - ${_param:infra_kvm_node01_hostname} - - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node01_hostname} + - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} kvm02: address: ${_param:infra_kvm_node02_address} names: - - ${_param:infra_kvm_node02_hostname} - - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node02_hostname} + - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} kvm03: address: ${_param:infra_kvm_node03_address} names: - - ${_param:infra_kvm_node03_hostname} - - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node03_hostname} + - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index 266f2ba65..d5f2e92d1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -1,21 +1,21 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- service.keepalived.cluster.single -- system.glusterfs.server.volume.glance -- system.glusterfs.server.volume.keystone -- system.glusterfs.server.cluster -- system.salt.control.virt -- system.salt.control.cluster.openstack_control_cluster -- system.salt.control.cluster.openstack_proxy_cluster -- system.salt.control.cluster.openstack_database_cluster -- system.salt.control.cluster.openstack_message_queue_cluster -- system.salt.control.cluster.openstack_telemetry_cluster -# - system.salt.control.cluster.stacklight_server_cluster -# - system.salt.control.cluster.stacklight_log_cluster -# - system.salt.control.cluster.stacklight_telemetry_cluster -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - service.keepalived.cluster.single + - system.glusterfs.server.volume.glance + - system.glusterfs.server.volume.keystone + - system.glusterfs.server.cluster + - system.salt.control.virt + - system.salt.control.cluster.openstack_control_cluster + - system.salt.control.cluster.openstack_proxy_cluster + - system.salt.control.cluster.openstack_database_cluster + - system.salt.control.cluster.openstack_message_queue_cluster + - system.salt.control.cluster.openstack_telemetry_cluster + # - system.salt.control.cluster.stacklight_server_cluster + # - system.salt.control.cluster.stacklight_log_cluster + # - system.salt.control.cluster.stacklight_telemetry_cluster + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: linux_system_codename: xenial @@ -25,11 +25,11 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: enp6s0 + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: - size: #RAM 4096,8192,16384,32768,65536 - ##Default production sizing + size: # RAM 4096,8192,16384,32768,65536 + # Default production sizing openstack.control: cpu: 4 ram: 12288 @@ -55,21 +55,21 @@ parameters: ram: 2048 disk_profile: small net_profile: default -# stacklight.log: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default -# stacklight.server: -# cpu: 2 -# ram: 4096 -# disk_profile: small -# net_profile: default -# stacklight.telemetry: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default + # stacklight.log: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default + # stacklight.server: + # cpu: 2 + # ram: 4096 + # disk_profile: small + # net_profile: default + # stacklight.telemetry: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default cluster: internal: node: @@ -121,15 +121,15 @@ parameters: - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On + cluster.readdir-optimize: 'On' + nfs.disable: 'On' + network.remote-dio: 'On' diagnostics.client-log-level: WARNING diagnostics.brick-log-level: WARNING linux: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual @@ -141,19 +141,17 @@ parameters: enabled: true proto: dhcp type: bridge - name_servers: - - 8.8.8.8 - - 8.8.4.4 + name_servers: ${_param:opnfv_name_servers} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} noifupdown: true - vlan300: + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:deploy_nic}.300 + name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} br-ctl: enabled: true type: bridge @@ -161,4 +159,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:deploy_nic}.300 + - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml index 3f08290f8..9c76526a3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml @@ -1,12 +1,13 @@ +--- classes: -- system.linux.system.repo.saltstack.xenial -- system.maas.region.single -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - system.maas.region.single + - service.maas.cluster.single + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: - dhcp_interface: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface} interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -14,7 +15,7 @@ parameters: maas_admin_username: opnfv maas_admin_password: opnfv_secret maas_db_password: opnfv_secret - dns_server01: 8.8.4.4 + dns_server01: ${_param:opnfv_dns_server01} single_address: ${_param:infra_maas_node01_deploy_address} maas: region: @@ -32,12 +33,12 @@ parameters: default_min_hwe_kernel: 'hwe-16.04' subnets: opnfv_maas_pxe: - name: ${_param:opnfv_maas_pxe_network}/24 - cidr: ${_param:opnfv_maas_pxe_network}/24 + name: ${_param:opnfv_maas_pxe_network_address}/24 + cidr: ${_param:opnfv_maas_pxe_network_address}/24 gateway_ip: ${_param:single_address} iprange: - start: ${_param:opnfv_maas_pxe_iprange_start} - end: ${_param:opnfv_maas_pxe_iprange_end} + start: ${_param:opnfv_maas_pxe_start_address} + end: ${_param:opnfv_maas_pxe_end_address} type: dynamic vlans: untagged: @@ -47,57 +48,57 @@ parameters: machines: kvm01: interface: - mac: "00:25:b5:a0:00:2a" + mac: ${_param:opnfv_maas_node01_interface_mac} power_parameters: - power_address: "172.30.8.75" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node01_power_address} + power_password: ${_param:opnfv_maas_node01_power_password} + power_type: ${_param:opnfv_maas_node01_power_type} + power_user: ${_param:opnfv_maas_node01_power_user} + architecture: ${_param:opnfv_maas_node01_architecture} distro_series: xenial hwe_kernel: hwe-16.04 kvm02: interface: - mac: "00:25:b5:a0:00:3a" + mac: ${_param:opnfv_maas_node02_interface_mac} power_parameters: - power_address: "172.30.8.65" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node02_power_address} + power_password: ${_param:opnfv_maas_node02_power_password} + power_type: ${_param:opnfv_maas_node02_power_type} + power_user: ${_param:opnfv_maas_node02_power_user} + architecture: ${_param:opnfv_maas_node02_architecture} distro_series: xenial hwe_kernel: hwe-16.04 kvm03: interface: - mac: "00:25:b5:a0:00:4a" + mac: ${_param:opnfv_maas_node03_interface_mac} power_parameters: - power_address: "172.30.8.74" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node03_power_address} + power_password: ${_param:opnfv_maas_node03_power_password} + power_type: ${_param:opnfv_maas_node03_power_type} + power_user: ${_param:opnfv_maas_node03_power_user} + architecture: ${_param:opnfv_maas_node03_architecture} distro_series: xenial hwe_kernel: hwe-16.04 cmp001: interface: - mac: "00:25:b5:a0:00:5a" + mac: ${_param:opnfv_maas_node04_interface_mac} power_parameters: - power_address: "172.30.8.73" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node04_power_address} + power_password: ${_param:opnfv_maas_node04_power_password} + power_type: ${_param:opnfv_maas_node04_power_type} + power_user: ${_param:opnfv_maas_node04_power_user} + architecture: ${_param:opnfv_maas_node04_architecture} distro_series: xenial hwe_kernel: hwe-16.04 cmp002: interface: - mac: "00:25:b5:a0:00:6a" + mac: ${_param:opnfv_maas_node05_interface_mac} power_parameters: - power_address: "172.30.8.72" - power_password: "octopus" - power_type: ipmi - power_user: "admin" - architecture: 'amd64/generic' + power_address: ${_param:opnfv_maas_node05_power_address} + power_password: ${_param:opnfv_maas_node05_power_password} + power_type: ${_param:opnfv_maas_node05_power_type} + power_user: ${_param:opnfv_maas_node05_power_user} + architecture: ${_param:opnfv_maas_node05_architecture} distro_series: xenial hwe_kernel: hwe-16.04 linux: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml index 1b839fb19..b282a8f43 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml @@ -1,4 +1,5 @@ +--- classes: -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml index 9233d6a34..083a2df68 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml @@ -1,8 +1,12 @@ +--- classes: -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index 126751c4b..e8fc0870f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.glusterfs.client.cluster -- system.nova.compute.cluster -- system.nova.compute.nfv.hugepages -- system.nova.compute.nfv.cpu_pinning -- system.neutron.compute.nfv.dpdk -- system.neutron.gateway.cluster -- system.cinder.volume.single -- system.cinder.volume.backend.lvm -- system.ceilometer.agent.cluster -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.storage.loopback + - system.glusterfs.client.cluster + - system.nova.compute.cluster + - system.nova.compute.nfv.hugepages + - system.nova.compute.nfv.cpu_pinning + - system.neutron.compute.nfv.dpdk + - system.neutron.gateway.cluster + - system.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: cluster_vip_address: ${_param:openstack_control_address} @@ -24,16 +24,16 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - linux_system_codename: xenial - external_nic: enp8s0 + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 + linux_system_codename: xenial neutron: gateway: - dpdk: True + dpdk: 'True' backend: tenant_vlan_range: ${_param:neutron_tenant_vlan_range} nova: @@ -48,6 +48,7 @@ parameters: server: ${_param:glusterfs_service_host} user: nova group: nova + # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: system: @@ -57,6 +58,7 @@ parameters: vm.dirty_background_ratio: 5 repo: uca: + # yamllint disable-line rule:line-length source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" architectures: amd64 key_id: EC4926EA @@ -75,13 +77,13 @@ parameters: mtu: ${_param:interface_mtu} proto: manual type: eth - vlan300: + mgmt-vlan: enabled: true proto: manual type: vlan - name: ${_param:mgmt_nic}.300 + name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:mgmt_nic} + - ${_param:mgmt_nic} br-ctl: enabled: true type: bridge @@ -89,7 +91,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.300 + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge @@ -106,9 +108,9 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_nic} + - ${_param:external_nic} use_ovs_ports: - - float-to-ex + - float-to-ex dpdk0: name: ${_param:dpdk0_name} pci: ${_param:dpdk0_pci} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml index 7e8ea312f..1aba5242a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml @@ -1,29 +1,29 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.ceilometer.client -- system.memcached.server.single -- system.keystone.server.cluster -- system.keystone.server.wsgi -- system.glance.control.cluster -- system.neutron.control.openvswitch.cluster -- system.nova.control.cluster -- system.cinder.control.cluster -- system.cinder.control.backend.lvm -- system.heat.server.cluster -- system.designate.server.cluster -- system.designate.server.backend.bind -- system.bind.server.single -- system.haproxy.proxy.listen.openstack.nova-placement -- system.haproxy.proxy.listen.openstack.glare -- system.glusterfs.client.cluster -- system.glusterfs.client.volume.glance -- system.glusterfs.client.volume.keystone -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.ceilometer.client + - system.memcached.server.single + - system.keystone.server.cluster + - system.keystone.server.wsgi + - system.glance.control.cluster + - system.neutron.control.openvswitch.cluster + - system.nova.control.cluster + - system.cinder.control.cluster + - system.cinder.control.backend.lvm + - system.heat.server.cluster + - system.designate.server.cluster + - system.designate.server.backend.bind + - system.bind.server.single + - system.haproxy.proxy.listen.openstack.nova-placement + - system.haproxy.proxy.listen.openstack.glare + - system.glusterfs.client.cluster + - system.glusterfs.client.volume.glance + - system.glusterfs.client.volume.keystone + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -41,8 +41,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml index e759c0c8d..79c387940 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.keystone.client.single -- system.keystone.client.service.aodh -- system.keystone.client.service.ceilometer -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 -- system.keystone.client.service.designate + - system.keystone.client.single + - system.keystone.client.service.aodh + - system.keystone.client.service.ceilometer + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.designate diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml index 3b0514fbe..1b3c5c5a9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml @@ -1,11 +1,12 @@ +--- classes: -- system.horizon.server.single -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha + - system.horizon.server.single + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: _param: horizon_site_branding: OpenStack Dashboard linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml index b0b462ad8..9ecf7e923 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml @@ -1,22 +1,22 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.galera.server.cluster -- system.galera.server.database.aodh -- system.galera.server.database.ceilometer -- system.galera.server.database.cinder -- system.galera.server.database.designate -- system.galera.server.database.glance -- system.galera.server.database.grafana -- system.galera.server.database.heat -- system.galera.server.database.keystone -- system.galera.server.database.nova -- system.galera.server.database.neutron -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.galera.server.cluster + - system.galera.server.database.aodh + - system.galera.server.database.ceilometer + - system.galera.server.database.cinder + - system.galera.server.database.designate + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.neutron + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml index b16f05593..5dcb9c9e1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml @@ -1,2 +1,3 @@ +--- classes: -- system.mysql.client.single + - system.mysql.client.single diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml index a4e4e1ab7..9fa69baf3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml @@ -1,34 +1,36 @@ +--- +# yamllint disable rule:line-length parameters: _param: openstack_version: ocata - openstack_gateway_node01_address: 10.167.4.124 - openstack_gateway_node02_address: 10.167.4.125 - openstack_gateway_node03_address: 10.167.4.126 - openstack_gateway_node01_tenant_address: 10.1.0.6 - openstack_gateway_node02_tenant_address: 10.1.0.7 - openstack_gateway_node03_tenant_address: 10.1.0.9 + openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address} + openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address} + openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address} + openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address} + openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address} openstack_gateway_node01_hostname: gtw01 openstack_gateway_node02_hostname: gtw02 openstack_gateway_node03_hostname: gtw03 # openstack service addresses - openstack_proxy_address: 10.167.4.80 - openstack_proxy_node01_address: 10.167.4.81 - openstack_proxy_node02_address: 10.167.4.82 - openstack_control_address: 10.167.4.10 - openstack_control_node01_address: 10.167.4.11 - openstack_control_node02_address: 10.167.4.12 - openstack_control_node03_address: 10.167.4.13 - openstack_database_address: 10.167.4.50 - openstack_database_node01_address: 10.167.4.51 - openstack_database_node02_address: 10.167.4.52 - openstack_database_node03_address: 10.167.4.53 - openstack_message_queue_address: 10.167.4.40 - openstack_message_queue_node01_address: 10.167.4.41 - openstack_message_queue_node02_address: 10.167.4.42 - openstack_message_queue_node03_address: 10.167.4.43 + openstack_proxy_address: ${_param:opnfv_openstack_proxy_address} + openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address} + openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address} + openstack_control_address: ${_param:opnfv_openstack_control_address} + openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} + openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} + openstack_database_address: ${_param:opnfv_openstack_database_address} + openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address} + openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address} + openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address} + openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address} + openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address} + openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address} + openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address} openstack_telemetry_hostname: mdb @@ -36,23 +38,23 @@ parameters: openstack_telemetry_node02_hostname: mdb02 openstack_telemetry_node03_hostname: mdb03 - openstack_telemetry_address: 10.167.4.75 - openstack_telemetry_node01_address: 10.167.4.76 - openstack_telemetry_node02_address: 10.167.4.77 - openstack_telemetry_node03_address: 10.167.4.78 + openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address} + openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address} + openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address} + openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address} # OpenStack Compute - openstack_compute_node01_single_address: 10.167.4.101 - openstack_compute_node02_single_address: 10.167.4.102 - openstack_compute_node03_single_address: 10.167.4.103 - openstack_compute_node01_control_address: 10.167.4.101 - openstack_compute_node02_control_address: 10.167.4.102 - openstack_compute_node03_control_address: 10.167.4.103 - openstack_compute_node01_tenant_address: 10.1.0.101 - openstack_compute_node02_tenant_address: 10.1.0.102 - openstack_compute_node03_tenant_address: 10.1.0.103 - openstack_compute_node01_external_address: 172.30.10.2 - openstack_compute_node02_external_address: 172.30.10.3 + openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address} + openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address} + openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address} + openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address} + openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address} + openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address} + openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address} + openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address} + openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address} + openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address} + openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address} # openstack service hostnames openstack_proxy_hostname: prx @@ -77,17 +79,17 @@ parameters: openstack_region: RegionOne admin_email: root@localhost - ##Neutron osv/nodvr - neutron_control_dvr: False + # Neutron osv/nodvr + neutron_control_dvr: 'False' neutron_tenant_network_types: "flat,vlan" - neutron_l3_ha: True + neutron_l3_ha: 'True' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: True + neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -148,6 +150,7 @@ parameters: keystone_designate_password: opnfv_secret ceilometer_secret_key: opnfv_secret horizon_version: ${_param:openstack_version} + # yamllint disable rule:line-length horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e horizon_identity_host: ${_param:openstack_control_address} horizon_identity_encryption: none @@ -188,14 +191,14 @@ parameters: rndc_key_file: /etc/designate/rndc.key designate_version: ${_param:openstack_version} # Billing - #keystone_billometer_password: opnfv_secret - #keystone_billometer_address: ${_param:billometer_service_host} - #billometer_service_host: ${_param:openstack_billing_address} - #billometer_version: ${_param:openstack_version} - #billometer_secret_key: opnfv_secretpasswordpasswordpassword - #billometer_identity_password: ${_param:keystone_billometer_password} - #billometer_identity_host: ${_param:openstack_control_address} - #billometer_identity_token: ${_param:keystone_service_token} + # keystone_billometer_password: opnfv_secret + # keystone_billometer_address: ${_param:billometer_service_host} + # billometer_service_host: ${_param:openstack_billing_address} + # billometer_version: ${_param:openstack_version} + # billometer_secret_key: opnfv_secretpasswordpasswordpassword + # billometer_identity_password: ${_param:keystone_billometer_password} + # billometer_identity_host: ${_param:openstack_control_address} + # billometer_identity_token: ${_param:keystone_service_token} linux: system: repo: @@ -214,108 +217,108 @@ parameters: prx: address: ${_param:openstack_proxy_address} names: - - ${_param:openstack_proxy_hostname} - - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_hostname} + - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} prx01: address: ${_param:openstack_proxy_node01_address} names: - - ${_param:openstack_proxy_node01_hostname} - - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node01_hostname} + - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} prx02: address: ${_param:openstack_proxy_node02_address} names: - - ${_param:openstack_proxy_node02_hostname} - - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node02_hostname} + - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} ctl: address: ${_param:openstack_control_address} names: - - ${_param:openstack_control_hostname} - - ${_param:openstack_control_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_hostname} + - ${_param:openstack_control_hostname}.${_param:cluster_domain} ctl01: address: ${_param:openstack_control_node01_address} names: - - ${_param:openstack_control_node01_hostname} - - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node01_hostname} + - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} ctl02: address: ${_param:openstack_control_node02_address} names: - - ${_param:openstack_control_node02_hostname} - - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node02_hostname} + - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} ctl03: address: ${_param:openstack_control_node03_address} names: - - ${_param:openstack_control_node03_hostname} - - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node03_hostname} + - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} msg: address: ${_param:openstack_message_queue_address} names: - - ${_param:openstack_message_queue_hostname} - - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_hostname} + - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} msg01: address: ${_param:openstack_message_queue_node01_address} names: - - ${_param:openstack_message_queue_node01_hostname} - - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node01_hostname} + - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} msg02: address: ${_param:openstack_message_queue_node02_address} names: - - ${_param:openstack_message_queue_node02_hostname} - - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node02_hostname} + - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} msg03: address: ${_param:openstack_message_queue_node03_address} names: - - ${_param:openstack_message_queue_node03_hostname} - - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node03_hostname} + - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} dbs: address: ${_param:openstack_database_address} names: - - ${_param:openstack_database_hostname} - - ${_param:openstack_database_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_hostname} + - ${_param:openstack_database_hostname}.${_param:cluster_domain} dbs01: address: ${_param:openstack_database_node01_address} names: - - ${_param:openstack_database_node01_hostname} - - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node01_hostname} + - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} dbs02: address: ${_param:openstack_database_node02_address} names: - - ${_param:openstack_database_node02_hostname} - - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node02_hostname} + - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} dbs03: address: ${_param:openstack_database_node03_address} names: - - ${_param:openstack_database_node03_hostname} - - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node03_hostname} + - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} mdb: address: ${_param:openstack_telemetry_address} names: - - ${_param:openstack_telemetry_hostname} - - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_hostname} + - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} mdb01: address: ${_param:openstack_telemetry_node01_address} names: - - ${_param:openstack_telemetry_node01_hostname} - - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node01_hostname} + - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} mdb02: address: ${_param:openstack_telemetry_node02_address} names: - - ${_param:openstack_telemetry_node02_hostname} - - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node02_hostname} + - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} mdb03: address: ${_param:openstack_telemetry_node03_address} names: - - ${_param:openstack_telemetry_node03_hostname} - - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node03_hostname} + - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} cmp001: address: ${_param:openstack_compute_node01_control_address} names: - - ${_param:openstack_compute_node01_hostname} - - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node01_hostname} + - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} cmp002: address: ${_param:openstack_compute_node02_control_address} names: - - ${_param:openstack_compute_node02_hostname} - - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node02_hostname} + - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} # gtw01: # address: ${_param:openstack_gateway_node01_address} # names: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml index 90a9d1377..ba9e0656f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml @@ -1,13 +1,13 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.rabbitmq.server.cluster -- system.rabbitmq.server.vhost.openstack -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.rabbitmq.server.cluster + - system.rabbitmq.server.vhost.openstack + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml index c85909fc3..16c4a0968 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml @@ -1,23 +1,23 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.nginx.server.single -- system.nginx.server.proxy.openstack_api -- system.nginx.server.proxy.openstack_vnc -- system.nginx.server.proxy.openstack_web -- system.nginx.server.proxy.openstack.aodh -- system.nginx.server.proxy.openstack.ceilometer -- system.horizon.server.single -- system.salt.minion.cert.proxy -- system.sphinx.server.doc.reclass -- service.keepalived.cluster.single -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.nginx.server.single + - system.nginx.server.proxy.openstack_api + - system.nginx.server.proxy.openstack_vnc + - system.nginx.server.proxy.openstack_web + - system.nginx.server.proxy.openstack.aodh + - system.nginx.server.proxy.openstack.ceilometer + - system.horizon.server.single + - system.salt.minion.cert.proxy + - system.sphinx.server.doc.reclass + - service.keepalived.cluster.single + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml index b2e49cb7e..38267218c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.mongodb.server.cluster -- system.mongodb.server.database.ceilometer -- system.ceilometer.server.backend.mongodb -# - system.ceilometer.server.backend.influxdb -# - system.heka.ceilometer_collector.single -- system.ceilometer.server.cluster -- system.aodh.server.cluster -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.mongodb.server.cluster + - system.mongodb.server.database.ceilometer + - system.ceilometer.server.backend.mongodb + # - system.ceilometer.server.backend.influxdb + # - system.heka.ceilometer_collector.single + - system.ceilometer.server.cluster + - system.aodh.server.cluster + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml index 452062191..75c20f4b4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml @@ -1,23 +1,24 @@ +--- classes: -- service.git.client -- system.linux.system.single -- system.linux.system.repo.mcp.salt -- system.linux.system.repo.saltstack.xenial -- system.salt.master.api -- system.salt.master.pkg -- system.salt.minion.ca.salt_master -- system.reclass.storage.salt -- system.reclass.storage.system.physical_control_cluster -- system.reclass.storage.system.openstack_control_cluster -- system.reclass.storage.system.openstack_proxy_cluster -- system.reclass.storage.system.openstack_database_cluster -- system.reclass.storage.system.openstack_message_queue_cluster -- system.reclass.storage.system.openstack_telemetry_cluster -# - system.reclass.storage.system.stacklight_log_cluster -# - system.reclass.storage.system.stacklight_monitor_cluster -# - system.reclass.storage.system.stacklight_telemetry_cluster -- system.reclass.storage.system.infra_maas_single -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.linux.system.repo.saltstack.xenial + - system.salt.master.api + - system.salt.master.pkg + - system.salt.minion.ca.salt_master + - system.reclass.storage.salt + - system.reclass.storage.system.physical_control_cluster + - system.reclass.storage.system.openstack_control_cluster + - system.reclass.storage.system.openstack_proxy_cluster + - system.reclass.storage.system.openstack_database_cluster + - system.reclass.storage.system.openstack_message_queue_cluster + - system.reclass.storage.system.openstack_telemetry_cluster + # - system.reclass.storage.system.stacklight_log_cluster + # - system.reclass.storage.system.stacklight_monitor_cluster + # - system.reclass.storage.system.stacklight_telemetry_cluster + - system.reclass.storage.system.infra_maas_single + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: salt_master_base_environment: prd @@ -27,12 +28,15 @@ parameters: single_address: ${_param:infra_config_address} deploy_address: ${_param:infra_config_deploy_address} salt_master_host: ${_param:infra_config_deploy_address} + # yamllint disable rule:line-length salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode @@ -78,16 +82,16 @@ parameters: openstack_proxy_node02: params: linux_system_codename: xenial -# stacklight_log_node01: -# classes: -# - system.elasticsearch.client.single -# stacklight_monitor_node01: -# classes: -# - system.grafana.client.single -# - system.kibana.client.single + # stacklight_log_node01: + # classes: + # - system.elasticsearch.client.single + # stacklight_monitor_node01: + # classes: + # - system.grafana.client.single + # - system.kibana.client.single openstack_control_node01: classes: - - cluster.${_param:cluster_name}.openstack.control_init + - cluster.${_param:cluster_name}.openstack.control_init params: linux_system_codename: xenial openstack_control_node02: @@ -98,7 +102,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.${_param:cluster_name}.openstack.database_init + - cluster.${_param:cluster_name}.openstack.database_init params: linux_system_codename: xenial openstack_database_node02: @@ -111,7 +115,7 @@ parameters: name: ${_param:openstack_compute_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial @@ -123,7 +127,7 @@ parameters: name: ${_param:openstack_compute_node02_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.compute + - cluster.${_param:cluster_name}.openstack.compute params: salt_master_host: ${_param:reclass_config_master} linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml index efb288e77..7c250a30e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml @@ -1,16 +1,18 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-ovs-ha.openstack -# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight -# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-ovs-ha.openstack + # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight + # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 + salt_version: 2016.11 cluster_name: baremetal-mcp-ocata-ovs-ha cluster_domain: ${_param:cluster_name}.local -# stacklight_environment: ${_param:cluster_domain} + # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master cluster_public_host: ${_param:openstack_proxy_address} infra_config_hostname: cfg01 @@ -43,17 +45,22 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 + # yamllint disable-line rule:line-length salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: system: @@ -67,30 +74,30 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - ${_param:infra_config_hostname} - - ${_param:infra_config_hostname}.${_param:cluster_domain} + - ${_param:infra_config_hostname} + - ${_param:infra_config_hostname}.${_param:cluster_domain} mas01: address: ${_param:infra_maas_node01_address} names: - - ${_param:infra_maas_node01_hostname} - - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_maas_node01_hostname} + - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain} kvm01: address: ${_param:infra_kvm_node01_address} names: - - ${_param:infra_kvm_node01_hostname} - - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node01_hostname} + - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain} kvm02: address: ${_param:infra_kvm_node02_address} names: - - ${_param:infra_kvm_node02_hostname} - - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node02_hostname} + - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain} kvm03: address: ${_param:infra_kvm_node03_address} names: - - ${_param:infra_kvm_node03_hostname} - - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} + - ${_param:infra_kvm_node03_hostname} + - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml index 3e9879b43..eb73e1cca 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml @@ -1,21 +1,21 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- service.keepalived.cluster.single -- system.glusterfs.server.volume.glance -- system.glusterfs.server.volume.keystone -- system.glusterfs.server.cluster -- system.salt.control.virt -- system.salt.control.cluster.openstack_control_cluster -- system.salt.control.cluster.openstack_proxy_cluster -- system.salt.control.cluster.openstack_database_cluster -- system.salt.control.cluster.openstack_message_queue_cluster -- system.salt.control.cluster.openstack_telemetry_cluster -# - system.salt.control.cluster.stacklight_server_cluster -# - system.salt.control.cluster.stacklight_log_cluster -# - system.salt.control.cluster.stacklight_telemetry_cluster -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - service.keepalived.cluster.single + - system.glusterfs.server.volume.glance + - system.glusterfs.server.volume.keystone + - system.glusterfs.server.cluster + - system.salt.control.virt + - system.salt.control.cluster.openstack_control_cluster + - system.salt.control.cluster.openstack_proxy_cluster + - system.salt.control.cluster.openstack_database_cluster + - system.salt.control.cluster.openstack_message_queue_cluster + - system.salt.control.cluster.openstack_telemetry_cluster + # - system.salt.control.cluster.stacklight_server_cluster + # - system.salt.control.cluster.stacklight_log_cluster + # - system.salt.control.cluster.stacklight_telemetry_cluster + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: linux_system_codename: xenial @@ -25,11 +25,11 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: enp6s0 + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: - size: #RAM 4096,8192,16384,32768,65536 - ##Default production sizing + size: # RAM 4096,8192,16384,32768,65536 + # Default production sizing openstack.control: cpu: 4 ram: 12288 @@ -50,31 +50,29 @@ parameters: ram: 3072 disk_profile: xxlarge net_profile: default + # stacklight.log: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default + # stacklight.server: + # cpu: 2 + # ram: 4096 + # disk_profile: small + # net_profile: default + # stacklight.telemetry: + # cpu: 2 + # ram: 4096 + # disk_profile: xxlarge + # net_profile: default openstack.proxy: cpu: 2 ram: 2048 disk_profile: small net_profile: default -# stacklight.log: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default -# stacklight.server: -# cpu: 2 -# ram: 4096 -# disk_profile: small -# net_profile: default -# stacklight.telemetry: -# cpu: 2 -# ram: 4096 -# disk_profile: xxlarge -# net_profile: default cluster: internal: node: - prx02: - provider: kvm03.${_param:cluster_domain} mdb01: image: ${_param:salt_control_xenial_image} mdb02: @@ -103,6 +101,7 @@ parameters: image: ${_param:salt_control_xenial_image} prx02: image: ${_param:salt_control_xenial_image} + provider: kvm03.${_param:cluster_domain} virt: nic: default: @@ -123,15 +122,15 @@ parameters: - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances options: - cluster.readdir-optimize: On - nfs.disable: On - network.remote-dio: On + cluster.readdir-optimize: 'On' + nfs.disable: 'On' + network.remote-dio: 'On' diagnostics.client-log-level: WARNING diagnostics.brick-log-level: WARNING linux: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual @@ -145,7 +144,7 @@ parameters: type: bridge name_servers: ${_param:opnfv_name_servers} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} noifupdown: true mgmt-vlan: enabled: true @@ -153,7 +152,7 @@ parameters: type: vlan name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:deploy_nic} + - ${_param:deploy_nic} br-ctl: enabled: true type: bridge @@ -161,4 +160,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml index 3a98fac2a..1ec662d93 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml @@ -1,12 +1,13 @@ +--- classes: -- system.linux.system.repo.saltstack.xenial -- system.maas.region.single -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - system.maas.region.single + - service.maas.cluster.single + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - dhcp_interface: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} + primary_interface: ${_param:opnfv_fn_vm_secondary_interface} + pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface} interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -32,12 +33,12 @@ parameters: default_min_hwe_kernel: 'hwe-16.04' subnets: opnfv_maas_pxe: - name: ${_param:opnfv_maas_pxe_network}/24 - cidr: ${_param:opnfv_maas_pxe_network}/24 + name: ${_param:opnfv_maas_pxe_network_address}/24 + cidr: ${_param:opnfv_maas_pxe_network_address}/24 gateway_ip: ${_param:single_address} iprange: - start: ${_param:opnfv_maas_pxe_iprange_start} - end: ${_param:opnfv_maas_pxe_iprange_end} + start: ${_param:opnfv_maas_pxe_start_address} + end: ${_param:opnfv_maas_pxe_end_address} type: dynamic vlans: untagged: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml index e571689ef..0f7a36cf6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml @@ -1,4 +1,5 @@ +--- classes: -- cluster.all-mcp-ocata-common -- cluster.baremetal-mcp-ocata-ovs-ha.infra -- cluster.baremetal-mcp-ocata-ovs-ha.openstack + - cluster.all-mcp-ocata-common + - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-ocata-ovs-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml index 371928a81..7d5eb80c3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml @@ -1,8 +1,12 @@ +--- classes: -- cluster.baremetal-mcp-ocata-ovs-ha + - cluster.baremetal-mcp-ocata-ovs-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index fca40654a..165e0c9c4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -1,17 +1,17 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- system.glusterfs.client.cluster -- system.nova.compute.cluster -- system.nova.compute.nfv.hugepages -- system.nova.compute.nfv.cpu_pinning -- system.neutron.gateway.cluster -- system.cinder.volume.single -- system.cinder.volume.backend.lvm -- system.ceilometer.agent.cluster -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.linux.storage.loopback + - system.glusterfs.client.cluster + - system.nova.compute.cluster + - system.nova.compute.nfv.hugepages + - system.nova.compute.nfv.cpu_pinning + - system.neutron.gateway.cluster + - system.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: cluster_vip_address: ${_param:openstack_control_address} @@ -23,9 +23,9 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - tenant_nic: enp7s0 - external_nic: enp8s0 + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + tenant_nic: ${_param:opnfv_baremetal_secondary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} linux_system_codename: xenial interface_mtu: 1500 keepalived_vip_interface: br-ctl @@ -39,6 +39,7 @@ parameters: server: ${_param:glusterfs_service_host} user: nova group: nova + # yamllint disable-line rule:line-length opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}" linux: system: @@ -72,21 +73,21 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} + - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} mgmt-vlan: enabled: true proto: manual type: vlan name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} use_interfaces: - - ${_param:mgmt_nic} + - ${_param:mgmt_nic} tenant-vlan: enabled: true proto: manual type: vlan name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan} use_interfaces: - - ${_param:tenant_nic} + - ${_param:tenant_nic} br-ctl: enabled: true type: bridge @@ -94,7 +95,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} + - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan} br-floating: enabled: true type: ovs_bridge @@ -111,6 +112,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_nic} + - ${_param:external_nic} use_ovs_ports: - - float-to-ex + - float-to-ex diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 1711ab0fe..3fd4fd185 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -1,29 +1,29 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.ceilometer.client -- system.memcached.server.single -- system.keystone.server.cluster -- system.keystone.server.wsgi -- system.glance.control.cluster -- system.neutron.control.openvswitch.cluster -- system.nova.control.cluster -- system.cinder.control.cluster -- system.cinder.control.backend.lvm -- system.heat.server.cluster -- system.designate.server.cluster -- system.designate.server.backend.bind -- system.bind.server.single -- system.haproxy.proxy.listen.openstack.nova-placement -- system.haproxy.proxy.listen.openstack.glare -- system.glusterfs.client.cluster -- system.glusterfs.client.volume.glance -- system.glusterfs.client.volume.keystone -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.ceilometer.client + - system.memcached.server.single + - system.keystone.server.cluster + - system.keystone.server.wsgi + - system.glance.control.cluster + - system.neutron.control.openvswitch.cluster + - system.nova.control.cluster + - system.cinder.control.cluster + - system.cinder.control.backend.lvm + - system.heat.server.cluster + - system.designate.server.cluster + - system.designate.server.backend.bind + - system.bind.server.single + - system.haproxy.proxy.listen.openstack.nova-placement + - system.haproxy.proxy.listen.openstack.glare + - system.glusterfs.client.cluster + - system.glusterfs.client.volume.glance + - system.glusterfs.client.volume.keystone + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -37,8 +37,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml index e759c0c8d..79c387940 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.keystone.client.single -- system.keystone.client.service.aodh -- system.keystone.client.service.ceilometer -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 -- system.keystone.client.service.designate + - system.keystone.client.single + - system.keystone.client.service.aodh + - system.keystone.client.service.ceilometer + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.designate diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml index 39cc073a6..03635ca68 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml @@ -1,11 +1,12 @@ +--- classes: -- system.horizon.server.single -- cluster.baremetal-mcp-ocata-ovs-ha + - system.horizon.server.single + - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: horizon_site_branding: OpenStack Dashboard linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index 4cb7397f2..e2ee1a89c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml @@ -1,22 +1,22 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.galera.server.cluster -- system.galera.server.database.aodh -- system.galera.server.database.ceilometer -- system.galera.server.database.cinder -- system.galera.server.database.designate -- system.galera.server.database.glance -- system.galera.server.database.grafana -- system.galera.server.database.heat -- system.galera.server.database.keystone -- system.galera.server.database.nova -- system.galera.server.database.neutron -- cluster.baremetal-mcp-ocata-ovs-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.galera.server.cluster + - system.galera.server.database.aodh + - system.galera.server.database.ceilometer + - system.galera.server.database.cinder + - system.galera.server.database.designate + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.neutron + - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml index b16f05593..5dcb9c9e1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml @@ -1,2 +1,3 @@ +--- classes: -- system.mysql.client.single + - system.mysql.client.single diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml index eff56516d..7ce282be5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml @@ -1,8 +1,10 @@ +--- parameters: _param: openstack_version: ocata + # yamllint disable rule:line-length openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address} openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address} openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address} @@ -77,17 +79,17 @@ parameters: openstack_region: RegionOne admin_email: root@localhost - ##Neutron osv/nodvr - neutron_control_dvr: False + # Neutron osv/nodvr + neutron_control_dvr: 'False' neutron_tenant_network_types: "flat,vxlan" - neutron_l3_ha: True + neutron_l3_ha: 'True' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: True + neutron_compute_external_access: 'True' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -182,129 +184,129 @@ parameters: rndc_key_file: /etc/designate/rndc.key designate_version: ${_param:openstack_version} # Billing - #keystone_billometer_password: opnfv_secret - #keystone_billometer_address: ${_param:billometer_service_host} - #billometer_service_host: ${_param:openstack_billing_address} - #billometer_version: ${_param:openstack_version} - #billometer_secret_key: opnfv_secretpasswordpasswordpassword - #billometer_identity_password: ${_param:keystone_billometer_password} - #billometer_identity_host: ${_param:openstack_control_address} - #billometer_identity_token: ${_param:keystone_service_token} + # keystone_billometer_password: opnfv_secret + # keystone_billometer_address: ${_param:billometer_service_host} + # billometer_service_host: ${_param:openstack_billing_address} + # billometer_version: ${_param:openstack_version} + # billometer_secret_key: opnfv_secretpasswordpasswordpassword + # billometer_identity_password: ${_param:keystone_billometer_password} + # billometer_identity_host: ${_param:openstack_control_address} + # billometer_identity_token: ${_param:keystone_service_token} linux: network: host: prx: address: ${_param:openstack_proxy_address} names: - - ${_param:openstack_proxy_hostname} - - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_hostname} + - ${_param:openstack_proxy_hostname}.${_param:cluster_domain} prx01: address: ${_param:openstack_proxy_node01_address} names: - - ${_param:openstack_proxy_node01_hostname} - - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node01_hostname} + - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain} prx02: address: ${_param:openstack_proxy_node02_address} names: - - ${_param:openstack_proxy_node02_hostname} - - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_proxy_node02_hostname} + - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain} ctl: address: ${_param:openstack_control_address} names: - - ${_param:openstack_control_hostname} - - ${_param:openstack_control_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_hostname} + - ${_param:openstack_control_hostname}.${_param:cluster_domain} ctl01: address: ${_param:openstack_control_node01_address} names: - - ${_param:openstack_control_node01_hostname} - - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node01_hostname} + - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain} ctl02: address: ${_param:openstack_control_node02_address} names: - - ${_param:openstack_control_node02_hostname} - - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node02_hostname} + - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain} ctl03: address: ${_param:openstack_control_node03_address} names: - - ${_param:openstack_control_node03_hostname} - - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_control_node03_hostname} + - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain} msg: address: ${_param:openstack_message_queue_address} names: - - ${_param:openstack_message_queue_hostname} - - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_hostname} + - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain} msg01: address: ${_param:openstack_message_queue_node01_address} names: - - ${_param:openstack_message_queue_node01_hostname} - - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node01_hostname} + - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain} msg02: address: ${_param:openstack_message_queue_node02_address} names: - - ${_param:openstack_message_queue_node02_hostname} - - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node02_hostname} + - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain} msg03: address: ${_param:openstack_message_queue_node03_address} names: - - ${_param:openstack_message_queue_node03_hostname} - - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_message_queue_node03_hostname} + - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain} dbs: address: ${_param:openstack_database_address} names: - - ${_param:openstack_database_hostname} - - ${_param:openstack_database_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_hostname} + - ${_param:openstack_database_hostname}.${_param:cluster_domain} dbs01: address: ${_param:openstack_database_node01_address} names: - - ${_param:openstack_database_node01_hostname} - - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node01_hostname} + - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain} dbs02: address: ${_param:openstack_database_node02_address} names: - - ${_param:openstack_database_node02_hostname} - - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node02_hostname} + - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain} dbs03: address: ${_param:openstack_database_node03_address} names: - - ${_param:openstack_database_node03_hostname} - - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_database_node03_hostname} + - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain} mdb: address: ${_param:openstack_telemetry_address} names: - - ${_param:openstack_telemetry_hostname} - - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_hostname} + - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain} mdb01: address: ${_param:openstack_telemetry_node01_address} names: - - ${_param:openstack_telemetry_node01_hostname} - - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node01_hostname} + - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain} mdb02: address: ${_param:openstack_telemetry_node02_address} names: - - ${_param:openstack_telemetry_node02_hostname} - - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node02_hostname} + - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain} mdb03: address: ${_param:openstack_telemetry_node03_address} names: - - ${_param:openstack_telemetry_node03_hostname} - - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} + - ${_param:openstack_telemetry_node03_hostname} + - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain} cmp001: address: ${_param:openstack_compute_node01_control_address} names: - - ${_param:openstack_compute_node01_hostname} - - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node01_hostname} + - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain} cmp002: address: ${_param:openstack_compute_node02_control_address} names: - - ${_param:openstack_compute_node02_hostname} - - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_compute_node02_hostname} + - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain} gtw01: address: ${_param:openstack_gateway_node01_address} names: - - ${_param:openstack_gateway_node01_hostname} - - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain} + - ${_param:openstack_gateway_node01_hostname} + - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain} gtw02: address: ${_param:openstack_gateway_node02_address} names: - - ${_param:openstack_gateway_node02_hostname} - - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} + - ${_param:openstack_gateway_node02_hostname} + - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 881644bf4..67a5d3d5a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -1,13 +1,13 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.rabbitmq.server.cluster -- system.rabbitmq.server.vhost.openstack -- cluster.baremetal-mcp-ocata-ovs-ha + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.rabbitmq.server.cluster + - system.rabbitmq.server.vhost.openstack + - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index 5e9a2c544..c6a68fa29 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -1,23 +1,23 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.nginx.server.single -- system.nginx.server.proxy.openstack_api -- system.nginx.server.proxy.openstack_vnc -- system.nginx.server.proxy.openstack_web -- system.nginx.server.proxy.openstack.aodh -- system.nginx.server.proxy.openstack.ceilometer -- system.horizon.server.single -- system.salt.minion.cert.proxy -- system.sphinx.server.doc.reclass -- service.keepalived.cluster.single -- cluster.baremetal-mcp-ocata-ovs-ha.infra -- cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard -# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.nginx.server.single + - system.nginx.server.proxy.openstack_api + - system.nginx.server.proxy.openstack_vnc + - system.nginx.server.proxy.openstack_web + - system.nginx.server.proxy.openstack.aodh + - system.nginx.server.proxy.openstack.ceilometer + - system.horizon.server.single + - system.salt.minion.cert.proxy + - system.sphinx.server.doc.reclass + - service.keepalived.cluster.single + - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard + # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index 0e3c7bdae..4a72a61e6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml @@ -1,18 +1,18 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.mongodb.server.cluster -- system.mongodb.server.database.ceilometer -- system.ceilometer.server.backend.mongodb -# - system.ceilometer.server.backend.influxdb -# - system.heka.ceilometer_collector.single -- system.ceilometer.server.cluster -- system.aodh.server.cluster -- cluster.baremetal-mcp-ocata-ovs-ha.infra + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.mongodb.server.cluster + - system.mongodb.server.database.ceilometer + - system.ceilometer.server.backend.mongodb + # - system.ceilometer.server.backend.influxdb + # - system.heka.ceilometer_collector.single + - system.ceilometer.server.cluster + - system.aodh.server.cluster + - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml index f4ad1bfc2..63e506d9a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml @@ -1,3 +1,4 @@ +--- parameters: _param: haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 @@ -8,181 +9,181 @@ parameters: type: openstack-service service_name: cinder binds: - - address: ${_param:cluster_vip_address} - port: 8776 + - address: ${_param:cluster_vip_address} + port: 8776 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8776 + params: ${_param:haproxy_check} glance_api: type: openstack-service service_name: glance binds: - - address: ${_param:cluster_vip_address} - port: 9292 + - address: ${_param:cluster_vip_address} + port: 9292 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9292 + params: ${_param:haproxy_check} glance_registry_api: type: general-service service_name: glance binds: - - address: ${_param:cluster_vip_address} - port: 9191 + - address: ${_param:cluster_vip_address} + port: 9191 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9191 + params: ${_param:haproxy_check} glare: type: general-service service_name: glare binds: - - address: ${_param:cluster_vip_address} - port: 9494 + - address: ${_param:cluster_vip_address} + port: 9494 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9494 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9494 + params: ${_param:haproxy_check} heat_cloudwatch_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8003 + - address: ${_param:cluster_vip_address} + port: 8003 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8003 + params: ${_param:haproxy_check} heat_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8004 + - address: ${_param:cluster_vip_address} + port: 8004 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8004 + params: ${_param:haproxy_check} heat_cfn_api: type: openstack-service service_name: heat binds: - - address: ${_param:cluster_vip_address} - port: 8000 + - address: ${_param:cluster_vip_address} + port: 8000 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8000 + params: ${_param:haproxy_check} keystone_public_api: type: openstack-service service_name: keystone binds: - - address: ${_param:cluster_vip_address} - port: 5000 + - address: ${_param:cluster_vip_address} + port: 5000 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 5000 + params: ${_param:haproxy_check} keystone_admin_api: type: openstack-service service_name: keystone binds: - - address: ${_param:cluster_vip_address} - port: 35357 + - address: ${_param:cluster_vip_address} + port: 35357 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 35357 + params: ${_param:haproxy_check} neutron_api: type: openstack-service service_name: neutron binds: - - address: ${_param:cluster_vip_address} - port: 9696 + - address: ${_param:cluster_vip_address} + port: 9696 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9696 + params: ${_param:haproxy_check} nova_placement_api: mode: http binds: - - address: ${_param:cluster_vip_address} - port: 8778 + - address: ${_param:cluster_vip_address} + port: 8778 options: - - httpclose - - httplog + - httpclose + - httplog health-check: http: options: - - expect status 401 + - expect status 401 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8778 + params: ${_param:haproxy_check} nova_ec2_api: type: general-service service_name: nova check: false binds: - - address: ${_param:cluster_vip_address} - port: 8773 + - address: ${_param:cluster_vip_address} + port: 8773 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8773 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8773 + params: ${_param:haproxy_check} nova_api: type: openstack-service service_name: nova binds: - - address: ${_param:cluster_vip_address} - port: 8774 + - address: ${_param:cluster_vip_address} + port: 8774 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8774 + params: ${_param:haproxy_check} nova_metadata_api: type: openstack-service binds: - - address: ${_param:cluster_vip_address} - port: 8775 + - address: ${_param:cluster_vip_address} + port: 8775 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8775 + params: ${_param:haproxy_check} ceilometer_api: type: general-service check: false binds: - - address: ${_param:cluster_vip_address} - port: 8777 + - address: ${_param:cluster_vip_address} + port: 8777 servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8777 - params: ${_param:haproxy_check} + - name: ${_param:cluster_node01_hostname} + host: ${_param:cluster_node01_address} + port: 8777 + params: ${_param:haproxy_check} aodh-api: type: openstack-service service_name: aodh binds: - - address: ${_param:cluster_vip_address} - port: 8042 + - address: ${_param:cluster_vip_address} + port: 8042 servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8042 - params: ${_param:haproxy_check} + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8042 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml index 73e2da5a9..07fada64d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -1,15 +1,16 @@ +--- classes: -- service.git.client -- system.linux.system.single -- system.linux.system.repo.mcp.salt -- system.salt.master.api -- system.salt.master.pkg -- system.reclass.storage.salt -- system.salt.minion.ca.salt_master -- system.salt.minion.cert.proxy -- system.mysql.client.single -- system.reclass.storage.system.openstack_compute_multi -- system.reclass.storage.system.openstack_gateway_single + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.salt.master.api + - system.salt.master.pkg + - system.reclass.storage.salt + - system.salt.minion.ca.salt_master + - system.salt.minion.cert.proxy + - system.mysql.client.single + - system.reclass.storage.system.openstack_compute_multi + - system.reclass.storage.system.openstack_gateway_single parameters: _param: openstack_control_node01_hostname: ctl01 @@ -20,6 +21,7 @@ parameters: salt_master_host: 127.0.0.1 salt_master_base_environment: prd salt_minion_ca_host: ${linux:network:fqdn} + # yamllint disable-line rule:line-length salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" linux: network: @@ -43,7 +45,7 @@ parameters: name: ${_param:openstack_control_node01_hostname} domain: ${_param:cluster_domain} classes: - - cluster.${_param:cluster_name}.openstack.control + - cluster.${_param:cluster_name}.openstack.control params: linux_system_codename: xenial salt_master_host: ${_param:reclass_config_master} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml index 9140bd0bc..e027e5b12 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml @@ -1,3 +1,4 @@ +--- parameters: linux: network: @@ -5,10 +6,10 @@ parameters: cfg01: address: ${_param:infra_config_address} names: - - cfg01 - - cfg01.${_param:cluster_domain} + - cfg01 + - cfg01.${_param:cluster_domain} cfg: address: ${_param:infra_config_address} names: - - cfg - - cfg.${_param:cluster_domain} + - cfg + - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml index 53e312787..18f8571a3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml @@ -1,3 +1,4 @@ +--- parameters: _param: # infra service addresses @@ -9,6 +10,7 @@ parameters: openstack_control_node03_address: 172.16.10.103 openstack_database_address: ${_param:openstack_control_address} openstack_message_queue_address: ${_param:openstack_control_address} + # yamllint disable rule:line-length openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml index 99f517f8a..ddd804a42 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml @@ -1,16 +1,14 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.linux.storage.loopback -- service.nfs.client -- system.nova.compute.single -- service.neutron.compute.single -- service.cinder.volume.single -- system.cinder.volume.backend.lvm -- system.ceilometer.agent.cluster -- system.ceilometer.client.nova_compute -- system.ceilometer.client.cinder_volume + - system.linux.storage.loopback + - service.nfs.client + - system.nova.compute.single + - service.neutron.compute.single + - service.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - system.ceilometer.client.nova_compute + - system.ceilometer.client.cinder_volume parameters: _param: primary_interface: ${_param:opnfv_fn_vm_secondary_interface} @@ -18,9 +16,11 @@ parameters: external_interface: ${_param:opnfv_fn_vm_quaternary_interface} interface_mtu: 9000 linux_system_codename: xenial - loopback_device_size: 10 + loopback_device_size: 20 nova: compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd vncproxy_url: http://${_param:cluster_vip_address}:6080 network: region: ${_param:openstack_region} @@ -54,6 +54,13 @@ parameters: device: ${_param:openstack_control_address}:/srv/nova/instances linux: system: + repo: + uca: + # yamllint disable-line rule:line-length + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" + architectures: amd64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com kernel: sysctl: vm.dirty_ratio: 10 @@ -70,7 +77,6 @@ parameters: primary_interface: enabled: true name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} proto: manual type: eth tenant_interface: @@ -86,4 +92,4 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:primary_interface} + - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml index 6ac8f6d62..a2382bb2d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml @@ -1,44 +1,44 @@ +--- classes: -- system.linux.system.lowmem -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- service.nfs.server -- system.mongodb.server.single -- system.mongodb.server.database.ceilometer -- system.ceilometer.client -- system.ceilometer.client.neutron -- system.memcached.server.single -- system.rabbitmq.server.single -- system.rabbitmq.server.vhost.openstack -- system.keystone.server.wsgi -- system.keystone.server.single -- system.keystone.client.single -- system.keystone.client.service.nova21 -- system.keystone.client.service.nova-placement -- system.keystone.client.service.glare -- system.keystone.client.service.cinder3 -- system.keystone.client.service.ceilometer -- system.keystone.client.service.aodh -- system.glance.control.single -- system.nova.control.single -- system.cinder.control.single -- system.cinder.control.backend.lvm -- system.heat.server.single -- service.mysql.server.single -- system.galera.server.database.cinder -- system.galera.server.database.glance -- system.galera.server.database.grafana -- system.galera.server.database.heat -- system.galera.server.database.keystone -- system.galera.server.database.nova -- system.galera.server.database.ceilometer -- system.galera.server.database.aodh -- service.ceilometer.server.single -- system.aodh.server.single -- system.horizon.server.single -- service.haproxy.proxy.single -- cluster.virtual-mcp-ocata-common.haproxy_openstack_api + - system.linux.system.lowmem + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - service.nfs.server + - system.mongodb.server.single + - system.mongodb.server.database.ceilometer + - system.ceilometer.client + - system.ceilometer.client.neutron + - system.memcached.server.single + - system.rabbitmq.server.single + - system.rabbitmq.server.vhost.openstack + - system.keystone.server.wsgi + - system.keystone.server.single + - system.keystone.client.single + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.glare + - system.keystone.client.service.cinder3 + - system.keystone.client.service.ceilometer + - system.keystone.client.service.aodh + - system.glance.control.single + - system.nova.control.single + - system.cinder.control.single + - system.cinder.control.backend.lvm + - system.heat.server.single + - service.mysql.server.single + - system.galera.server.database.cinder + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.ceilometer + - system.galera.server.database.aodh + - service.ceilometer.server.single + - system.aodh.server.single + - system.horizon.server.single + - service.haproxy.proxy.single + - cluster.virtual-mcp-ocata-common.haproxy_openstack_api parameters: _param: linux_system_codename: xenial @@ -67,16 +67,16 @@ parameters: server: admin_email: ${_param:admin_email} pkgs: - - keystone - - python-keystone - - python-keystoneclient - - python-psycopg2 - - python-mysqldb - - python-six - - python-memcache - - python-openstackclient - - gettext-base - - python-pycadf + - keystone + - python-keystone + - python-keystoneclient + - python-psycopg2 + - python-mysqldb + - python-six + - python-memcache + - python-openstackclient + - gettext-base + - python-pycadf glance: server: storage: @@ -129,6 +129,6 @@ parameters: nova: host: ${_param:single_address}/24 params: - - rw - - no_root_squash - - async + - rw + - no_root_squash + - async diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml index f726c4af2..c6e2b7e28 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml @@ -1,7 +1,7 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra parameters: _param: primary_interface: ${_param:opnfv_fn_vm_secondary_interface} @@ -53,7 +53,7 @@ parameters: netmask: 255.255.255.0 mtu: ${_param:interface_mtu} use_interfaces: - - ${_param:primary_interface} + - ${_param:primary_interface} float-to-ex: enabled: true type: ovs_port @@ -66,6 +66,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_interface} + - ${_param:external_interface} use_ovs_ports: - - float-to-ex + - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml index a14a7113a..8ac2391b7 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml @@ -1,3 +1,4 @@ +--- parameters: _param: openstack_version: ocata @@ -8,15 +9,15 @@ parameters: cluster_public_protocol: http cluster_public_host: 10.16.0.101 neutron_public_protocol: http - neutron_control_dvr: False - neutron_l3_ha: False + neutron_control_dvr: 'False' + neutron_l3_ha: 'False' neutron_global_physnet_mtu: 1500 neutron_external_mtu: 1500 - neutron_gateway_dvr: False + neutron_gateway_dvr: 'False' neutron_gateway_agent_mode: legacy - neutron_compute_dvr: False + neutron_compute_dvr: 'False' neutron_compute_agent_mode: legacy - neutron_compute_external_access: False + neutron_compute_external_access: 'False' galera_server_cluster_name: openstack_cluster galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret @@ -51,7 +52,6 @@ parameters: nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 neutron_version: ${_param:openstack_version} neutron_service_host: ${_param:cluster_local_address} - metadata_password: password mysql_admin_user: root mysql_admin_password: opnfv_secret mysql_cinder_password: opnfv_secret @@ -75,6 +75,7 @@ parameters: ceilometer_secret_key: opnfv_secret metadata_password: opnfv_secret horizon_version: ${_param:openstack_version} + # yamllint disable-line rule:line-length horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e horizon_identity_host: ${_param:cluster_vip_address} horizon_identity_encryption: none @@ -82,6 +83,7 @@ parameters: mongodb_server_replica_set: ceilometer mongodb_ceilometer_password: opnfv_secret mongodb_admin_password: opnfv_secret + # yamllint disable-line rule:line-length mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth aodh_version: ${_param:openstack_version} keystone_aodh_password: opnfv_secret @@ -98,25 +100,25 @@ parameters: ctl: address: ${_param:openstack_control_address} names: - - ctl - - ctl.${_param:cluster_domain} + - ctl + - ctl.${_param:cluster_domain} ctl01: address: ${_param:openstack_control_node01_address} names: - - ctl01 - - ctl01.${_param:cluster_domain} + - ctl01 + - ctl01.${_param:cluster_domain} gtw01: address: ${_param:openstack_gateway_address} names: - - gtw01 - - gtw01.${_param:cluster_domain} + - gtw01 + - gtw01.${_param:cluster_domain} cmp01: address: 172.16.10.105 names: - - cmp01 - - cmp01.${_param:cluster_domain} + - cmp01 + - cmp01.${_param:cluster_domain} cmp02: address: 172.16.10.106 names: - - cmp02 - - cmp02.${_param:cluster_domain} + - cmp02 + - cmp02.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml index c66ba2a9c..f8d80ed2c 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml @@ -1,14 +1,15 @@ +--- classes: -- system.reclass.storage.system.opendaylight_control_single -- cluster.virtual-mcp-ocata-common.infra.config -- cluster.virtual-mcp-ocata-odl-router + - system.reclass.storage.system.opendaylight_control_single + - cluster.virtual-mcp-ocata-common.infra.config + - cluster.virtual-mcp-ocata-odl-router parameters: reclass: storage: node: opendaylight_control_node01: classes: - - cluster.${_param:cluster_name}.opendaylight.control + - cluster.${_param:cluster_name}.opendaylight.control params: linux_system_codename: xenial single_address: ${_param:opendaylight_service_host} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml index 20d6d18d3..1f86ba534 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.virtual-mcp-ocata-common.init_options -- cluster.virtual-mcp-ocata-common.infra -- cluster.virtual-mcp-ocata-odl-router.openstack + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.virtual-mcp-ocata-common.init_options + - cluster.virtual-mcp-ocata-common.infra + - cluster.virtual-mcp-ocata-odl-router.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml index 8f83ddee8..1c659fa73 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml @@ -1,9 +1,9 @@ +--- classes: -- system.linux.system.repo.mcp.openstack -- system.linux.system.repo.mcp.extra -- system.linux.system.repo.saltstack.xenial -- system.opendaylight.server.single -- cluster.virtual-mcp-ocata-odl-router + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.opendaylight.server.single + - cluster.virtual-mcp-ocata-odl-router parameters: _param: linux_system_codename: xenial @@ -29,5 +29,6 @@ parameters: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + - odl-mdsal-apidocs netvirt: - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml index 5cfcd8d05..038df5c06 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml @@ -1,6 +1,7 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_compute -- cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-ocata-common.openstack_compute + - cluster.virtual-mcp-ocata-odl-router parameters: opendaylight: client: @@ -26,7 +27,7 @@ parameters: netmask: 255.255.255.0 gateway: 10.1.0.110 use_interfaces: - - ${_param:tenant_interface} + - ${_param:tenant_interface} br-floating: enabled: true type: ovs_bridge @@ -43,6 +44,6 @@ parameters: address: ${_param:external_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:external_interface} + - ${_param:external_interface} use_ovs_ports: - - float-to-ex + - float-to-ex diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml index 729b2f903..19083e5ff 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml @@ -1,7 +1,8 @@ +--- classes: -- system.neutron.control.opendaylight.single -- cluster.virtual-mcp-ocata-common.openstack_control -- cluster.virtual-mcp-ocata-odl-router + - system.neutron.control.opendaylight.single + - cluster.virtual-mcp-ocata-common.openstack_control + - cluster.virtual-mcp-ocata-odl-router parameters: neutron: server: @@ -14,21 +15,21 @@ parameters: type: general-service service_name: opendaylight binds: - - address: ${_param:cluster_vip_address} - port: 8181 + - address: ${_param:cluster_vip_address} + port: 8181 servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8181 - params: ${_param:haproxy_check} + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8181 + params: ${_param:haproxy_check} opendaylight-rest: type: general-service service_name: opendaylight binds: - - address: ${_param:cluster_vip_address} - port: 8282 + - address: ${_param:cluster_vip_address} + port: 8282 servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8282 - params: ${_param:haproxy_check} + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8282 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml index 8e5672f63..9cacab73b 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml @@ -1,12 +1,13 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_gateway -- system.neutron.gateway.opendaylight.single -- cluster.virtual-mcp-ocata-odl-router + - cluster.virtual-mcp-ocata-common.openstack_gateway + - system.neutron.gateway.opendaylight.single + - cluster.virtual-mcp-ocata-odl-router parameters: _param: neutron_agents: - - neutron-dhcp-agent - - neutron-metadata-agent + - neutron-dhcp-agent + - neutron-metadata-agent neutron: gateway: pkgs: ${_param:neutron_agents} @@ -30,4 +31,4 @@ parameters: address: ${_param:tenant_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:tenant_interface} + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml index af01e01b4..ed03eb43d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" @@ -8,6 +9,7 @@ parameters: system: repo: uca: + # yamllint disable-line rule:line-length source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" architectures: amd64 key_id: EC4926EA @@ -17,5 +19,5 @@ parameters: odl01: address: 172.16.10.111 names: - - odl01 - - odl01.${_param:cluster_domain} + - odl01 + - odl01.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml index 784011ad0..24163f9b2 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml @@ -1,6 +1,7 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.infra.config -- cluster.virtual-mcp-ocata-ovs-dpdk + - cluster.virtual-mcp-ocata-common.infra.config + - cluster.virtual-mcp-ocata-ovs-dpdk parameters: reclass: storage: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml index e4e09b52b..5436bfc01 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.virtual-mcp-ocata-common.init_options -- cluster.virtual-mcp-ocata-common.infra -- cluster.virtual-mcp-ocata-ovs-dpdk.openstack + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.virtual-mcp-ocata-common.init_options + - cluster.virtual-mcp-ocata-common.infra + - cluster.virtual-mcp-ocata-ovs-dpdk.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml index 12e261dab..57d7f2054 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml @@ -1,25 +1,17 @@ +--- classes: -- system.nova.compute.nfv.hugepages -- system.neutron.compute.nfv.dpdk -- cluster.virtual-mcp-ocata-common.openstack_compute -- cluster.virtual-mcp-ocata-ovs-dpdk + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - system.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk + - cluster.virtual-mcp-ocata-common.openstack_compute + - cluster.virtual-mcp-ocata-ovs-dpdk parameters: neutron: compute: backend: tenant_network_types: ${_param:neutron_tenant_network_types} - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com network: interface: dpdk0: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml index fb3f0e5d7..ba12a8be3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml @@ -1,7 +1,8 @@ +--- classes: -- system.neutron.control.openvswitch.single -- cluster.virtual-mcp-ocata-common.openstack_control -- cluster.virtual-mcp-ocata-ovs-dpdk + - system.neutron.control.openvswitch.single + - cluster.virtual-mcp-ocata-common.openstack_control + - cluster.virtual-mcp-ocata-ovs-dpdk parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml index 96af8cbd9..b2b007486 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml @@ -1,7 +1,8 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_gateway -- service.neutron.gateway.single -- cluster.virtual-mcp-ocata-ovs-dpdk + - cluster.virtual-mcp-ocata-common.openstack_gateway + - service.neutron.gateway.single + - cluster.virtual-mcp-ocata-ovs-dpdk parameters: neutron: gateway: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml index 14501050f..c2e1f08d3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vlan" diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml index c366ec502..657892100 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml @@ -1,3 +1,4 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.infra.config -- cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-ocata-common.infra.config + - cluster.virtual-mcp-ocata-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml index b6ff33202..56c7a498a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml @@ -1,9 +1,10 @@ +--- classes: -- system.linux.system.single -- cluster.all-mcp-ocata-common -- cluster.virtual-mcp-ocata-common.init_options -- cluster.virtual-mcp-ocata-common.infra -- cluster.virtual-mcp-ocata-ovs.openstack + - system.linux.system.single + - cluster.all-mcp-ocata-common + - cluster.virtual-mcp-ocata-common.init_options + - cluster.virtual-mcp-ocata-common.infra + - cluster.virtual-mcp-ocata-ovs.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml index a53d4e923..80007a444 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml @@ -1,6 +1,7 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_compute -- cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-ocata-common.openstack_compute + - cluster.virtual-mcp-ocata-ovs parameters: linux: network: @@ -12,4 +13,4 @@ parameters: address: ${_param:tenant_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:tenant_interface} + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml index 7e8f5dcdc..516673f24 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml @@ -1,4 +1,5 @@ +--- classes: -- system.neutron.control.openvswitch.single -- cluster.virtual-mcp-ocata-common.openstack_control -- cluster.virtual-mcp-ocata-ovs + - system.neutron.control.openvswitch.single + - cluster.virtual-mcp-ocata-common.openstack_control + - cluster.virtual-mcp-ocata-ovs diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml index f6f58066b..52dc07769 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml @@ -1,7 +1,8 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_gateway -- service.neutron.gateway.single -- cluster.virtual-mcp-ocata-ovs + - cluster.virtual-mcp-ocata-common.openstack_gateway + - service.neutron.gateway.single + - cluster.virtual-mcp-ocata-ovs parameters: linux: network: @@ -14,4 +15,4 @@ parameters: address: ${_param:tenant_address} netmask: 255.255.255.0 use_interfaces: - - ${_param:tenant_interface} + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml index f8f01298c..cdca65e85 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-common.openstack_init + - cluster.virtual-mcp-ocata-common.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml index 73b3b6d07..ff89dfb9d 100644 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.baremetal-mcp-ocata-odl-ha.infra.config + - cluster.baremetal-mcp-ocata-odl-ha.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml index 86a5607f6..e9b82cd6e 100644 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml index 468557dad..c52da4043 100644 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.baremetal-mcp-ocata-ovs-ha.infra.config + - cluster.baremetal-mcp-ocata-ovs-ha.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml index 62e563fd3..a8bf2ea74 100644 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-odl-router.infra.config + - cluster.virtual-mcp-ocata-odl-router.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml index 4e168e416..521da211f 100644 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-odl.infra.config + - cluster.virtual-mcp-ocata-odl.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml index f7a13bbe4..abf2aee99 100644 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-ovs-dpdk.infra.config + - cluster.virtual-mcp-ocata-ovs-dpdk.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml index 43202d6d2..08f80fb8b 100644 --- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml +++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml @@ -1,5 +1,6 @@ +--- classes: -- cluster.virtual-mcp-ocata-ovs.infra.config + - cluster.virtual-mcp-ocata-ovs.infra.config parameters: _param: linux_system_codename: xenial diff --git a/mcp/salt-formulas/maas/pxe_route.sls b/mcp/salt-formulas/maas/pxe_route.sls index 9c22b2a76..e6e9a7801 100644 --- a/mcp/salt-formulas/maas/pxe_route.sls +++ b/mcp/salt-formulas/maas/pxe_route.sls @@ -3,6 +3,6 @@ routes: - name: {{ salt['pillar.get']('_param:opnfv_fn_vm_primary_interface') }} - routes: - name: maas_mcp_to_pxe_network - ipaddr: {{ salt['pillar.get']('_param:opnfv_maas_pxe_network') }} + ipaddr: {{ salt['pillar.get']('_param:opnfv_maas_pxe_network_address') }} netmask: 255.255.255.0 gateway: {{ salt['pillar.get']('_param:opnfv_maas_mcp_address') }} diff --git a/mcp/salt-formulas/opendaylight/files/jetty.xml b/mcp/salt-formulas/opendaylight/files/jetty.xml index 062568c54..e6371883a 100644 --- a/mcp/salt-formulas/opendaylight/files/jetty.xml +++ b/mcp/salt-formulas/opendaylight/files/jetty.xml @@ -21,7 +21,7 @@ <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting// DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> -<Configure class="org.eclipse.jetty.server.Server"> +<Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> <!-- Set connectors --> @@ -31,41 +31,98 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <!-- Use this connector for many frequently idle connections and for threadless continuations. --> + <New id="http-default" class="org.eclipse.jetty.server.HttpConfiguration"> + <Set name="secureScheme">https</Set> + <Set name="securePort"> + <Property name="jetty.secure.port" default="8543" /> + </Set> + <Set name="outputBufferSize">32768</Set> + <Set name="requestHeaderSize">8192</Set> + <Set name="responseHeaderSize">8192</Set> + + <!-- Default security setting: do not leak our version --> + <Set name="sendServerVersion">false</Set> + + <Set name="sendDateHeader">false</Set> + <Set name="headerCacheSize">512</Set> + </New> + + <New id="http-legacy" class="org.eclipse.jetty.server.HttpConfiguration"> + <Set name="secureScheme">https</Set> + <Set name="securePort"> + <Property name="jetty.secure.port" default="8443" /> + </Set> + <Set name="outputBufferSize">32768</Set> + <Set name="requestHeaderSize">8192</Set> + <Set name="responseHeaderSize">8192</Set> + + <!-- Default security setting: do not leak our version --> + <Set name="sendServerVersion">false</Set> + + <Set name="sendDateHeader">false</Set> + <Set name="headerCacheSize">512</Set> + </New> + <Call name="addConnector"> <Arg> - <New class="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <New class="org.eclipse.jetty.server.ServerConnector"> + <Arg name="server"> + <Ref refid="Server" /> + </Arg> + <Arg name="factories"> + <Array type="org.eclipse.jetty.server.ConnectionFactory"> + <Item> + <New class="org.eclipse.jetty.server.HttpConnectionFactory"> + <Arg name="config"> + <Ref refid="http-default"/> + </Arg> + </New> + </Item> + </Array> + </Arg> <Set name="host">{{ server.odl_bind_ip }} - <Property name="jetty.host" /> + <Property name="jetty.host"/> </Set> <Set name="port"> - <Property name="jetty.port" default="8181" /> + <Property name="jetty.port" default="8181"/> </Set> - <Set name="maxIdleTime">300000</Set> - <Set name="Acceptors">2</Set> - <Set name="statsOn">false</Set> - <Set name="confidentialPort">8543</Set> - <Set name="lowResourcesConnections">20000</Set> - <Set name="lowResourcesMaxIdleTime">5000</Set> + <Set name="idleTimeout"> + <Property name="http.timeout" default="300000"/> + </Set> + <Set name="name">jetty-default</Set> </New> </Arg> </Call> + <Call name="addConnector"> - <Arg> - <New class="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <Set name="host">{{ server.odl_bind_ip }} - <Property name="jetty.host" /> - </Set> - <Set name="port"> - <Property name="jetty.port" default="{{ server.odl_rest_port }}" /> - </Set> - <Set name="maxIdleTime">300000</Set> - <Set name="Acceptors">2</Set> - <Set name="statsOn">false</Set> - <Set name="confidentialPort">8443</Set> - <Set name="lowResourcesConnections">20000</Set> - <Set name="lowResourcesMaxIdleTime">5000</Set> - </New> - </Arg> + <Arg> + <New class="org.eclipse.jetty.server.ServerConnector"> + <Arg name="server"> + <Ref refid="Server" /> + </Arg> + <Arg name="factories"> + <Array type="org.eclipse.jetty.server.ConnectionFactory"> + <Item> + <New class="org.eclipse.jetty.server.HttpConnectionFactory"> + <Arg name="config"> + <Ref refid="http-legacy" /> + </Arg> + </New> + </Item> + </Array> + </Arg> + <Set name="host">{{ server.odl_bind_ip }} + <Property name="jetty.host"/> + </Set> + <Set name="port"> + <Property name="jetty.port" default="{{ server.odl_rest_port }}"/> + </Set> + <Set name="idleTimeout"> + <Property name="http.timeout" default="300000"/> + </Set>q + <Set name="name">jetty-legacy</Set> + </New> + </Arg> </Call> <!-- =========================================================== --> @@ -77,7 +134,7 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <!-- =========================================================== --> <Call name="addBean"> <Arg> - <New class="org.eclipse.jetty.plus.jaas.JAASLoginService"> + <New class="org.eclipse.jetty.jaas.JAASLoginService"> <Set name="name">karaf</Set> <Set name="loginModuleName">karaf</Set> <Set name="roleClassNames"> @@ -91,7 +148,7 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> </Call> <Call name="addBean"> <Arg> - <New class="org.eclipse.jetty.plus.jaas.JAASLoginService"> + <New class="org.eclipse.jetty.jaas.JAASLoginService"> <Set name="name">default</Set> <Set name="loginModuleName">karaf</Set> <Set name="roleClassNames"> @@ -103,5 +160,4 @@ DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> </New> </Arg> </Call> - </Configure> diff --git a/mcp/salt-formulas/opendaylight/map.jinja b/mcp/salt-formulas/opendaylight/map.jinja index 0f6bf3c7e..755f878e2 100644 --- a/mcp/salt-formulas/opendaylight/map.jinja +++ b/mcp/salt-formulas/opendaylight/map.jinja @@ -1,10 +1,10 @@ {% set server = salt['grains.filter_by']({ 'Debian': { - 'karaf_features': {'default': ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management']}, + 'karaf_features': {'default': ['standard', 'wrap', 'ssh']}, 'odl_rest_port': '8282', 'odl_bind_ip': '0.0.0.0', - 'repo': 'odl-team/carbon', + 'repo': 'odl-team/nitrogen', 'log_levels': {}, 'enable_ha': false, 'ha_node_ips': [], diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index 8c6c3b28a..f7a97417e 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls @@ -14,12 +14,14 @@ opendaylight: - file: /opt/opendaylight/etc/jetty.xml - file: /opt/opendaylight/bin/setenv - ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg + - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg service.running: - enable: true - watch: - file: /opt/opendaylight/etc/jetty.xml - file: /opt/opendaylight/bin/setenv - ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg + - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg /opt/opendaylight/etc/jetty.xml: file.managed: @@ -46,6 +48,11 @@ opendaylight: - sections: featuresBoot: {{ features }} +/opt/opendaylight/etc/org.ops4j.pax.web.cfg: + ini.options_present: + - sections: + org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }} + {%- if server.get('router_enabled', false) %} /opt/opendaylight/etc/custom.properties: ini.options_present: diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh new file mode 100644 index 000000000..6dabe65fe --- /dev/null +++ b/mcp/scripts/globals.sh @@ -0,0 +1,21 @@ +#!/bin/bash -ex +############################################################################## +# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# Global variables +export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} +export SALT_MASTER=${INSTALLER_IP:-10.20.0.2} +export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} +export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3} + +# These should be determined from PDF later +export MAAS_PXE_NETWORK=${MAAS_PXE_NETWORK:-192.168.11.0} + +# Derivated from above global vars +export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}" +export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}" diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 650c63b16..fcc5d76ac 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -72,7 +72,7 @@ create_networks() { virsh net-undefine "${net}" fi # in case of custom network, host should already have the bridge in place - if [ -f "net_${net}.xml" ]; then + if [ -f "net_${net}.xml" ] && [ ! -d "/sys/class/net/${net}/bridge" ]; then virsh net-define "net_${net}.xml" virsh net-autostart "${net}" virsh net-start "${net}" @@ -103,12 +103,7 @@ create_vms() { vnode_networks[2]="${vnode_networks[0]}" fi for net in "${vnode_networks[@]:1}"; do - net_type="network" - # in case of custom network, host should already have the bridge in place - if [ ! -f "net_${net}.xml" ]; then - net_type="bridge" - fi - net_args="${net_args} --network ${net_type}=${net},model=virtio" + net_args="${net_args} --network bridge=${net},model=virtio" done # shellcheck disable=SC2086 @@ -176,7 +171,7 @@ parse_yaml() { s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs="$(echo @|tr @ '\034')" - sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ + sed -e 's|---||g' -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ -e "s|^\($s\)\($w\)$s[:-]$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" | awk -F"$fs" '{ indent = length($1)/2; diff --git a/mcp/scripts/log.sh b/mcp/scripts/log.sh index 1ae0953af..8c4bf3ef5 100755 --- a/mcp/scripts/log.sh +++ b/mcp/scripts/log.sh @@ -14,6 +14,8 @@ DEPLOY_LOG=$1 OPNFV_TMP_LOG="opnfv_fuel_logs" [ -n "${DEPLOY_LOG}" ] || exit 0 +# shellcheck disable=SC1090 +[ -n "${SSH_OPTS}" ] || source "$(dirname "${BASH_SOURCE[0]}")/globals.sh" # ssh to cfg01 # shellcheck disable=SC2086,2087 diff --git a/mcp/scripts/net_mcpcontrol.xml.template b/mcp/scripts/net_mcpcontrol.xml.template index 722a66aa9..ab58851e8 100644 --- a/mcp/scripts/net_mcpcontrol.xml.template +++ b/mcp/scripts/net_mcpcontrol.xml.template @@ -2,9 +2,9 @@ <name>mcpcontrol</name> <bridge name="mcpcontrol"/> <forward mode="nat"/> - <ip address="${MCP_CTRL_NETWORK_ROOTSTR}.1" netmask="255.255.255.0"> + <ip address="${SALT_MASTER%.*}.1" netmask="255.255.255.0"> <dhcp> - <range start="${MCP_CTRL_NETWORK_ROOTSTR}.2" end="${MCP_CTRL_NETWORK_ROOTSTR}.254"/> + <range start="${SALT_MASTER%.*}.2" end="${SALT_MASTER%.*}.254"/> </dhcp> </ip> </network> diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos new file mode 160000 +Subproject 2c4fac2e41aaca9dd679b200ffc968eeb448b39 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index f184bcde6..b0a26873d 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -13,15 +13,18 @@ F_GIT_ROOT=$(git rev-parse --show-toplevel) OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel" OPNFV_FUEL_DIR="/root/fuel" - -# patch reclass-system-salt-model locally before copying it over -make -C "${F_GIT_ROOT}/mcp/patches" deepclean patches-import +OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common" +LOCAL_PDF_RECLASS=$1 # push to cfg01 current git repo first (including submodules), at ~ubuntu/fuel # later we move it to ~root/fuel and delete the temporary clone rsync -Erl --delete -e "ssh ${SSH_OPTS}" \ --exclude-from="${F_GIT_ROOT}/.gitignore" \ "${F_GIT_ROOT}/" "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/" +if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then + rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \ + "${SSH_SALT}:$(basename "${OPNFV_TMP_DIR}")/mcp/${OPNFV_RDIR}/opnfv/" +fi # ssh to cfg01 # shellcheck disable=SC2086,2087 @@ -36,8 +39,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR} ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts - cd /srv/salt/reclass/classes/cluster/all-mcp-ocata-common && \ - ln -s "\$(uname -i)" arch + cd /srv/salt/${OPNFV_RDIR} && ln -s "\$(uname -i)" arch cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass cd /srv/salt/reclass/classes/service && \ @@ -60,8 +62,12 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END salt -C 'I@salt:master' state.sls linux salt -C '* and not cfg01*' state.sls linux + salt -C '* and not cfg01*' pkg.upgrade refresh=False salt '*' state.sls ntp - salt '*' pkg.upgrade refresh=False + # Temporary fixup for mismatch between neutron formula and reclass model + salt-call pkg.install salt-formula-neutron allow_updates=False refresh=False \ + version=2016.12.1+201709251458.f0607d9-1xenial1 + cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches_neutron.list formulas SALT_INSTALL_END |