diff options
Diffstat (limited to 'deploy')
28 files changed, 855 insertions, 92 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/neutron.conf b/deploy/adapters/ansible/openstack/templates/neutron.conf index ebc46f99..cbdd534d 100644 --- a/deploy/adapters/ansible/openstack/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack/templates/neutron.conf @@ -307,7 +307,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 index 743099cb..d4d232be 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka/roles/aodh/templates/aodh.conf.j2 @@ -40,7 +40,7 @@ os_username = aodh os_tenant_name = service os_password = {{ AODH_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne [api] host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml index 58751dfd..9e97a29c 100644 --- a/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka/roles/keystone/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: aodh type: alarming - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8042" internalurl: "http://{{ internal_vip.ip }}:8042" @@ -62,7 +62,7 @@ os_services: - name: cinder type: volume - region: regionOne + region: RegionOne description: "OpenStack Block Storage" publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: - name: cinderv2 type: volumev2 - region: regionOne + region: RegionOne description: "OpenStack Block Storage v2" publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -86,7 +86,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" diff --git a/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf b/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf index 5e33d3f7..33231ed5 100644 --- a/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_mitaka/templates/neutron.conf @@ -310,7 +310,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 index 743099cb..d4d232be 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/aodh/templates/aodh.conf.j2 @@ -40,7 +40,7 @@ os_username = aodh os_tenant_name = service os_password = {{ AODH_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne [api] host = {{ internal_ip }} diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml index 7a09378c..9ce499da 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: aodh type: alarming - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8042" internalurl: "http://{{ internal_vip.ip }}:8042" @@ -62,7 +62,7 @@ os_services: - name: cinder type: volume - region: regionOne + region: RegionOne description: "OpenStack Block Storage" publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: - name: cinderv2 type: volumev2 - region: regionOne + region: RegionOne description: "OpenStack Block Storage v2" publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -86,7 +86,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" @@ -94,7 +94,7 @@ os_services: - name: swift type: object-store - region: regionOne + region: RegionOne description: "OpenStack Object Storage" publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml index 9db404b9..aad55d05 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: aodh type: alarming - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8042" internalurl: "http://{{ internal_vip.ip }}:8042" @@ -62,7 +62,7 @@ os_services: # - name: cinder # type: volume -# region: regionOne +# region: RegionOne # description: "OpenStack Block Storage" # publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" # internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: # # - name: cinderv2 # type: volumev2 -# region: regionOne +# region: RegionOne # description: "OpenStack Block Storage v2" # publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" # internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -86,7 +86,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" @@ -94,7 +94,7 @@ os_services: - name: swift type: object-store - region: regionOne + region: RegionOne description: "OpenStack Object Storage" publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf b/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf index 5e33d3f7..33231ed5 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/templates/neutron.conf @@ -310,7 +310,7 @@ notify_nova_on_port_data_changes = True nova_url = http://{{ internal_vip.ip }}:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = regionOne +nova_region_name = RegionOne # Username for connection to nova in admin context nova_admin_username = nova diff --git a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 index ee78de01..275c991a 100644 --- a/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 +++ b/deploy/adapters/ansible/roles/ceilometer_compute/templates/ceilometer.j2 @@ -27,5 +27,5 @@ os_username = ceilometer os_tenant_name = service os_password = {{ CEILOMETER_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne diff --git a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 index b262a26b..d0cadeaa 100644 --- a/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 +++ b/deploy/adapters/ansible/roles/ceilometer_controller/templates/ceilometer.j2 @@ -28,7 +28,7 @@ os_username = ceilometer os_tenant_name = service os_password = {{ CEILOMETER_PASS }} os_endpoint_type = internalURL -os_region_name = regionOne +os_region_name = RegionOne [publisher] metering_secret = {{ metering_secret }} diff --git a/deploy/adapters/ansible/roles/keystone/vars/main.yml b/deploy/adapters/ansible/roles/keystone/vars/main.yml index 9a7312e9..c6725da6 100644 --- a/deploy/adapters/ansible/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/roles/keystone/vars/main.yml @@ -14,7 +14,7 @@ services_noarch: [] os_services: - name: keystone type: identity - region: regionOne + region: RegionOne description: "OpenStack Identity" publicurl: "http://{{ public_vip.ip }}:5000/v2.0" internalurl: "http://{{ internal_vip.ip }}:5000/v2.0" @@ -22,7 +22,7 @@ os_services: - name: glance type: image - region: regionOne + region: RegionOne description: "OpenStack Image Service" publicurl: "http://{{ public_vip.ip }}:9292" internalurl: "http://{{ internal_vip.ip }}:9292" @@ -30,7 +30,7 @@ os_services: - name: nova type: compute - region: regionOne + region: RegionOne description: "OpenStack Compute" publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s" @@ -38,7 +38,7 @@ os_services: - name: neutron type: network - region: regionOne + region: RegionOne description: "OpenStack Networking" publicurl: "http://{{ public_vip.ip }}:9696" internalurl: "http://{{ internal_vip.ip }}:9696" @@ -46,7 +46,7 @@ os_services: - name: ceilometer type: metering - region: regionOne + region: RegionOne description: "OpenStack Telemetry" publicurl: "http://{{ public_vip.ip }}:8777" internalurl: "http://{{ internal_vip.ip }}:8777" @@ -54,7 +54,7 @@ os_services: - name: cinder type: volume - region: regionOne + region: RegionOne description: "OpenStack Block Storage" publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" @@ -62,7 +62,7 @@ os_services: - name: cinderv2 type: volumev2 - region: regionOne + region: RegionOne description: "OpenStack Block Storage v2" publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" @@ -70,7 +70,7 @@ os_services: - name: heat type: orchestration - region: regionOne + region: RegionOne description: "OpenStack Orchestration" publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s" internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s" @@ -78,7 +78,7 @@ os_services: - name: heat-cfn type: cloudformation - region: regionOne + region: RegionOne description: "OpenStack CloudFormation Orchestration" publicurl: "http://{{ public_vip.ip }}:8000/v1" internalurl: "http://{{ internal_vip.ip }}:8000/v1" diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-compute/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-controller/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini index 87937cc7..5109d8b7 100644 --- a/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini +++ b/deploy/adapters/ansible/roles/nova-controller/templates/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True # The Neutron user information for accessing the Neutron API. auth_url = http://{{ internal_vip.ip }}:5000/v2.0 -auth_region = regionOne +auth_region = RegionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl diff --git a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml index 35f896dc..564b5506 100755 --- a/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml +++ b/deploy/adapters/ansible/roles/tacker/tasks/tacker_controller.yml @@ -76,7 +76,7 @@ - name: provide an endpoint to tacker service shell: > - . /opt/admin-openrc.sh; openstack endpoint create --region regionOne \ + . /opt/admin-openrc.sh; openstack endpoint create --region RegionOne \ --publicurl 'http://{{ public_vip.ip }}:8888/' \ --adminurl 'http://{{ internal_vip.ip }}:8888/' \ --internalurl 'http://{{ internal_vip.ip }}:8888/' tacker diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml new file mode 100644 index 00000000..dbaba01c --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 125 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 126 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.145.140.100" + - "10.145.140.105" + cidr: "10.145.140.0/24" + gw: "10.145.140.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.145.140.115 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "10.145.140.1" + floating_ip_cidr: "10.145.140.0/24" + floating_ip_start: "10.145.140.100" + floating_ip_end: "10.145.140.200" diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml new file mode 100644 index 00000000..b15ce35a --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 125 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 126 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.145.140.100" + - "10.145.140.105" + cidr: "10.145.140.0/24" + gw: "10.145.140.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.145.140.115 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: flat + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "100.100.100.1" + floating_ip_cidr: "100.100.100.0/24" + floating_ip_start: "100.100.100.30" + floating_ip_end: "100.100.100.120" diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml new file mode 100644 index 00000000..6c543b48 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml @@ -0,0 +1,90 @@ +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 125 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 126 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.16.1.1" + - "172.16.1.254" + cidr: "172.16.1.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.16.2.1" + - "172.16.2.254" + cidr: "172.16.2.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "10.145.140.100" + - "10.145.140.105" + cidr: "10.145.140.0/24" + gw: "10.145.140.1" + role: + - controller + - compute + +internal_vip: + ip: 172.16.1.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 10.145.140.115 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: True + network: ext-net + type: vxlan + segment_id: 1000 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: False + no_gateway: False + external_gw: "10.145.140.1" + floating_ip_cidr: "10.145.140.0/24" + floating_ip_start: "10.145.140.100" + floating_ip_end: "10.145.140.200" diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml new file mode 100644 index 00000000..56428daa --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml @@ -0,0 +1,63 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml new file mode 100644 index 00000000..65f31383 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml @@ -0,0 +1,62 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - opencontrail + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml new file mode 100644 index 00000000..e19937ec --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml @@ -0,0 +1,68 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +moon: "Enable" + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml new file mode 100644 index 00000000..3b01d83d --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml @@ -0,0 +1,66 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml new file mode 100644 index 00000000..dbc261a0 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml @@ -0,0 +1,68 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +odl_l3_agent: "Enable" + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - odl + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml new file mode 100644 index 00000000..cff1bcf2 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml @@ -0,0 +1,66 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml new file mode 100644 index 00000000..435d4481 --- /dev/null +++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml @@ -0,0 +1,68 @@ + +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: root +ipmiVer: '2.0' + +onos_sfc: "Enable" + +hosts: + - name: host1 + mac: '70:7b:e8:75:71:d3' + interfaces: + - eth1: '70:7b:e8:75:71:d2' + ipmiIp: 172.31.123.2 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: host2 + mac: '70:7b:e8:75:72:21' + interfaces: + - eth1: '70:7b:e8:75:72:20' + ipmiIp: 172.31.123.3 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host3 + mac: '70:7b:e8:75:71:37' + interfaces: + - eth1: '70:7b:e8:75:71:36' + ipmiIp: 172.31.123.4 + ipmiPass: root + roles: + - controller + - ha + - onos + - ceph-mon + + - name: host4 + mac: '70:7b:e8:75:71:dc' + interfaces: + - eth1: '70:7b:e8:75:71:db' + ipmiIp: 172.31.123.5 + ipmiPass: root + roles: + - compute + - ceph-osd + + - name: host5 + mac: '70:7b:e8:75:71:d6' + interfaces: + - eth1: '70:7b:e8:75:71:d5' + ipmiIp: 172.31.123.6 + ipmiPass: root + roles: + - compute + - ceph-osd + diff --git a/deploy/launch.sh b/deploy/launch.sh index 488e0fd7..2c272c79 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -15,7 +15,6 @@ mkdir -p $WORK_DIR/script export DEPLOY_FIRST_TIME=${DEPLOY_FIRST_TIME-"true"} source ${COMPASS_DIR}/deploy/prepare.sh -prepare_python_env source ${COMPASS_DIR}/util/log.sh source ${COMPASS_DIR}/deploy/deploy_parameter.sh source $(process_input_para $*) || exit 1 @@ -30,6 +29,16 @@ source ${COMPASS_DIR}/deploy/compass_vm.sh source ${COMPASS_DIR}/deploy/deploy_host.sh ######################### main process +download_iso +pre_prepare +prepare_env +if [[ "$DEPLOY_COMPASS" == "true" ]]; then + if ! prepare_python_env;then + echo "prepare_python_env failed" + exit 1 + fi +fi + print_logo if [[ ! -z $VIRT_NUMBER ]];then @@ -46,11 +55,6 @@ fi export machines if [[ "$DEPLOY_COMPASS" == "true" ]]; then - if ! prepare_env;then - echo "prepare_env failed" - exit 1 - fi - log_info "########## set up network begin #############" if ! create_nets;then log_error "create_nets failed" diff --git a/deploy/prepare.sh b/deploy/prepare.sh index a4f606af..7d7a02d5 100755 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -9,11 +9,11 @@ ############################################################################## function print_logo() { - if ! apt --installed list 2>/dev/null | grep "figlet" - then - sudo apt-get update -y - sudo apt-get install -y --force-yes figlet - fi +# if ! apt --installed list 2>/dev/null | grep "figlet" +# then +# sudo apt-get update -y +# sudo apt-get install -y --force-yes figlet +# fi figlet -ctf slant Compass Installer set +x; sleep 2; set -x @@ -32,32 +32,19 @@ function download_iso() fi fi + rm -rf $WORK_DIR/iso + mkdir -p $WORK_DIR/iso + mkdir -p $WORK_DIR/cache curl --connect-timeout 10 -o $WORK_DIR/cache/$iso_name $ISO_URL -} -function prepare_env() { - if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then - sudo apt-get update -y - sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch - sudo apt-get install -y --force-yes git python-dev - sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev - sudo apt-get install -y --force-yes libffi-dev libssl-dev - fi - - sudo service libvirt-bin restart - if sudo service openvswitch-switch status|grep stop; then - sudo service openvswitch-switch start - fi +} +function pre_prepare() { # prepare work dir - rm -rf $WORK_DIR/{installer,vm,network,iso} + rm -rf $WORK_DIR/{installer,vm,network} mkdir -p $WORK_DIR/installer mkdir -p $WORK_DIR/vm mkdir -p $WORK_DIR/network - mkdir -p $WORK_DIR/iso - mkdir -p $WORK_DIR/cache - - download_iso cp $WORK_DIR/cache/`basename $ISO_URL` $WORK_DIR/iso/centos.iso -f @@ -72,24 +59,65 @@ function prepare_env() { chmod 755 $WORK_DIR -R sudo cp ${COMPASS_DIR}/deploy/qemu_hook.sh /etc/libvirt/hooks/qemu + + rm -rf $WORK_DIR/cache/compass_tmp + mkdir -p $WORK_DIR/cache/compass_tmp + rm -rf $WORK_DIR/cache/jh_env_tmp + mkdir -p $WORK_DIR/cache/jh_env_tmp + sudo mount -o loop $WORK_DIR/cache/$iso_name $WORK_DIR/cache/compass_tmp/ + cp $WORK_DIR/cache/compass_tmp/jh_env_package/*.tar.gz $WORK_DIR/cache/jh_env_tmp/ + sudo umount $WORK_DIR/cache/compass_tmp/ + rm -rf $WORK_DIR/cache/compass_tmp + tar -zxvf $WORK_DIR/cache/jh_env_tmp/env_trusty_deb.tar.gz -C $WORK_DIR/cache/jh_env_tmp + tar -zxvf $WORK_DIR/cache/jh_env_tmp/env_trusty_pip.tar.gz -C $WORK_DIR/cache/jh_env_tmp +} + +function prepare_env() { + if [[ "$DEPLOY_FIRST_TIME" == "true" ]]; then + cd $WORK_DIR/cache/jh_env_tmp/jh_deb + dpkg -i *.deb + cd - + fi } function _prepare_python_env() { rm -rf $WORK_DIR/venv mkdir -p $WORK_DIR/venv - sudo apt-get install -y --force-yes python-pip - sudo pip install --upgrade virtualenv + rm -rf ~/.pip + mkdir -p ~/.pip + cd $WORK_DIR/cache/jh_env_tmp/ + +cat <<EOF > ~/.pip/pip.conf +[global] +find-links = http://127.0.0.1:9999/jh_pip +no-index = true +[install] +trusted-host=127.0.0.1 +EOF + + nohup python -m SimpleHTTPServer 9999 & + + cd - + virtualenv $WORK_DIR/venv source $WORK_DIR/venv/bin/activate - pip install --upgrade pip - pip install --upgrade cheetah - pip install --upgrade pyyaml - pip install --upgrade requests - pip install --upgrade netaddr - pip install --upgrade oslo.config - pip install --upgrade ansible + PIP="markupsafe virtualenv cheetah pyyaml requests netaddr pbr oslo.config ansible" + for i in ${PIP}; do + pip install --upgrade $i + done + service libvirt-bin restart + if sudo service openvswitch-switch status|grep stop; then + sudo service openvswitch-switch start + fi + + pid=$(ps -ef | grep SimpleHTTPServer | grep 9999 | awk '{print $2}') + echo $pid + kill -9 $pid + + rm -rf ~/.pip/pip.conf + rm -rf $WORK_DIR/cache/jh_env_tmp } function prepare_python_env() |