diff --git a/doc/admin-guide-cloud/source/compute-images-instances.rst b/doc/admin-guide-cloud/source/compute-images-instances.rst index 7903352260..4a4d468e71 100644 --- a/doc/admin-guide-cloud/source/compute-images-instances.rst +++ b/doc/admin-guide-cloud/source/compute-images-instances.rst @@ -436,6 +436,6 @@ Administrative users can specify which compute node their instances run on. To do this, specify the ``--availability-zone AVAILABILITY_ZONE:COMPUTE_HOST`` parameter. -.. |Base image state with no running instances| image:: ../../common/figures/instance-life-1.png -.. |Instance creation from image and runtime state| image:: ../../common/figures/instance-life-2.png -.. |End state of image and volume after instance exits| image:: ../../common/figures/instance-life-3.png +.. |Base image state with no running instances| image:: figures/instance-life-1.png +.. |Instance creation from image and runtime state| image:: figures/instance-life-2.png +.. |End state of image and volume after instance exits| image:: figures/instance-life-3.png diff --git a/doc/admin-guide-cloud/source/compute-networking-nova.rst b/doc/admin-guide-cloud/source/compute-networking-nova.rst index 9e3d946424..376e625c4b 100644 --- a/doc/admin-guide-cloud/source/compute-networking-nova.rst +++ b/doc/admin-guide-cloud/source/compute-networking-nova.rst @@ -1001,9 +1001,9 @@ the kernel module: Loading the module has no effect on running instances. -.. |multinic flat manager| image:: ../../common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-manager.jpg +.. |multinic flat manager| image:: figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-manager.jpg :width: 600 -.. |multinic flatdhcp manager| image:: ../../common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-DHCP-manager.jpg +.. |multinic flatdhcp manager| image:: figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-DHCP-manager.jpg :width: 600 -.. |multinic VLAN manager| image:: ../../common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-VLAN-manager.jpg +.. |multinic VLAN manager| image:: figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-VLAN-manager.jpg :width: 600 diff --git a/doc/admin-guide-cloud/source/compute-security.rst b/doc/admin-guide-cloud/source/compute-security.rst index 8bda75cc42..fd8c657a51 100644 --- a/doc/admin-guide-cloud/source/compute-security.rst +++ b/doc/admin-guide-cloud/source/compute-security.rst @@ -137,8 +137,8 @@ settings: |Trusted compute pool| -.. |image0| image:: ../../common/figures/OpenStackTrustedComputePool1.png -.. |Trusted compute pool| image:: ../../common/figures/OpenStackTrustedComputePool2.png +.. |image0| image:: figures/OpenStackTrustedComputePool1.png +.. |Trusted compute pool| image:: figures/OpenStackTrustedComputePool2.png Encrypt Compute metadata traffic diff --git a/doc/common/figures/OpenStackTrustedComputePool1.png b/doc/admin-guide-cloud/source/figures/OpenStackTrustedComputePool1.png similarity index 100% rename from doc/common/figures/OpenStackTrustedComputePool1.png rename to doc/admin-guide-cloud/source/figures/OpenStackTrustedComputePool1.png diff --git a/doc/common/figures/OpenStackTrustedComputePool2.png b/doc/admin-guide-cloud/source/figures/OpenStackTrustedComputePool2.png similarity index 100% rename from doc/common/figures/OpenStackTrustedComputePool2.png rename to doc/admin-guide-cloud/source/figures/OpenStackTrustedComputePool2.png diff --git a/doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-DHCP-manager.jpg b/doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-DHCP-manager.jpg similarity index 100% rename from doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-DHCP-manager.jpg rename to doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-DHCP-manager.jpg diff --git a/doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-manager.jpg b/doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-manager.jpg similarity index 100% rename from doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-manager.jpg rename to doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-Flat-manager.jpg diff --git a/doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-VLAN-manager.jpg b/doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-VLAN-manager.jpg similarity index 100% rename from doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-VLAN-manager.jpg rename to doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack-VLAN-manager.jpg diff --git a/doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack.vsd b/doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack.vsd similarity index 100% rename from doc/common/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack.vsd rename to doc/admin-guide-cloud/source/figures/SCH_5007_V00_NUAC-multi_nic_OpenStack.vsd diff --git a/doc/common/figures/demo_multiple_dhcp_agents.png b/doc/admin-guide-cloud/source/figures/demo_multiple_dhcp_agents.png similarity index 100% rename from doc/common/figures/demo_multiple_dhcp_agents.png rename to doc/admin-guide-cloud/source/figures/demo_multiple_dhcp_agents.png diff --git a/doc/common/figures/fwaas.png b/doc/admin-guide-cloud/source/figures/fwaas.png similarity index 100% rename from doc/common/figures/fwaas.png rename to doc/admin-guide-cloud/source/figures/fwaas.png diff --git a/doc/common/figures/fwaas.svg b/doc/admin-guide-cloud/source/figures/fwaas.svg similarity index 100% rename from doc/common/figures/fwaas.svg rename to doc/admin-guide-cloud/source/figures/fwaas.svg diff --git a/doc/common/figures/instance-life-1.png b/doc/admin-guide-cloud/source/figures/instance-life-1.png similarity index 100% rename from doc/common/figures/instance-life-1.png rename to doc/admin-guide-cloud/source/figures/instance-life-1.png diff --git a/doc/common/figures/instance-life-2.png b/doc/admin-guide-cloud/source/figures/instance-life-2.png similarity index 100% rename from doc/common/figures/instance-life-2.png rename to doc/admin-guide-cloud/source/figures/instance-life-2.png diff --git a/doc/common/figures/instance-life-3.png b/doc/admin-guide-cloud/source/figures/instance-life-3.png similarity index 100% rename from doc/common/figures/instance-life-3.png rename to doc/admin-guide-cloud/source/figures/instance-life-3.png diff --git a/doc/common/figures/vmware_nsx_ex1.graffle b/doc/admin-guide-cloud/source/figures/vmware_nsx_ex1.graffle similarity index 100% rename from doc/common/figures/vmware_nsx_ex1.graffle rename to doc/admin-guide-cloud/source/figures/vmware_nsx_ex1.graffle diff --git a/doc/common/figures/vmware_nsx_ex1.png b/doc/admin-guide-cloud/source/figures/vmware_nsx_ex1.png similarity index 100% rename from doc/common/figures/vmware_nsx_ex1.png rename to doc/admin-guide-cloud/source/figures/vmware_nsx_ex1.png diff --git a/doc/common/figures/vmware_nsx_ex1.svg b/doc/admin-guide-cloud/source/figures/vmware_nsx_ex1.svg similarity index 100% rename from doc/common/figures/vmware_nsx_ex1.svg rename to doc/admin-guide-cloud/source/figures/vmware_nsx_ex1.svg diff --git a/doc/common/figures/vmware_nsx_ex2.graffle b/doc/admin-guide-cloud/source/figures/vmware_nsx_ex2.graffle similarity index 100% rename from doc/common/figures/vmware_nsx_ex2.graffle rename to doc/admin-guide-cloud/source/figures/vmware_nsx_ex2.graffle diff --git a/doc/common/figures/vmware_nsx_ex2.png b/doc/admin-guide-cloud/source/figures/vmware_nsx_ex2.png similarity index 100% rename from doc/common/figures/vmware_nsx_ex2.png rename to doc/admin-guide-cloud/source/figures/vmware_nsx_ex2.png diff --git a/doc/common/figures/vmware_nsx_ex2.svg b/doc/admin-guide-cloud/source/figures/vmware_nsx_ex2.svg similarity index 100% rename from doc/common/figures/vmware_nsx_ex2.svg rename to doc/admin-guide-cloud/source/figures/vmware_nsx_ex2.svg diff --git a/doc/admin-guide-cloud/source/networking_arch.rst b/doc/admin-guide-cloud/source/networking_arch.rst index 6eb6d6131b..2b46ab2958 100644 --- a/doc/admin-guide-cloud/source/networking_arch.rst +++ b/doc/admin-guide-cloud/source/networking_arch.rst @@ -83,6 +83,6 @@ service on the network node. The green arrow indicates the management relationship between the NSX controller and the network node. -.. figure:: ../../common/figures/vmware_nsx_ex1.png +.. figure:: figures/vmware_nsx_ex1.png -.. figure:: ../../common/figures/vmware_nsx_ex2.png +.. figure:: figures/vmware_nsx_ex2.png diff --git a/doc/admin-guide-cloud/source/networking_introduction.rst b/doc/admin-guide-cloud/source/networking_introduction.rst index f33b396325..ac269cf762 100644 --- a/doc/admin-guide-cloud/source/networking_introduction.rst +++ b/doc/admin-guide-cloud/source/networking_introduction.rst @@ -172,7 +172,7 @@ the perimeter to filter traffic at the neutron router. The example diagram illustrates the flow of ingress and egress traffic for the VM2 instance: -.. figure:: ../../common/figures/fwaas.png +.. figure:: figures/fwaas.png **To enable FWaaS** diff --git a/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst b/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst index 7d43cde300..e642882faf 100644 --- a/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst +++ b/doc/admin-guide-cloud/source/networking_multi-dhcp-agents.rst @@ -28,7 +28,7 @@ scalability and HA. | extraroute | Neutron Extra Route | +-----------------+--------------------------+ -.. figure:: ../../common/figures/demo_multiple_dhcp_agents.png +.. figure:: figures/demo_multiple_dhcp_agents.png There will be three hosts in the setup. diff --git a/doc/common/figures/FlatNetworkMultInterface.png b/doc/common/figures/FlatNetworkMultInterface.png deleted file mode 100644 index 701bf3d5b9..0000000000 Binary files a/doc/common/figures/FlatNetworkMultInterface.png and /dev/null differ diff --git a/doc/common/figures/FlatNetworkSingleInterface.png b/doc/common/figures/FlatNetworkSingleInterface.png deleted file mode 100644 index 69a18f2fdb..0000000000 Binary files a/doc/common/figures/FlatNetworkSingleInterface.png and /dev/null differ diff --git a/doc/common/figures/FlatNetworkSingleInterfaceAllInOne.png b/doc/common/figures/FlatNetworkSingleInterfaceAllInOne.png deleted file mode 100644 index 403b9c7e11..0000000000 Binary files a/doc/common/figures/FlatNetworkSingleInterfaceAllInOne.png and /dev/null differ diff --git a/doc/common/figures/Flavors-TGen-Cloud-Dashboard.png b/doc/common/figures/Flavors-TGen-Cloud-Dashboard.png deleted file mode 100644 index 2d3cff7569..0000000000 Binary files a/doc/common/figures/Flavors-TGen-Cloud-Dashboard.png and /dev/null differ diff --git a/doc/common/figures/Images.png b/doc/common/figures/Images.png deleted file mode 100644 index 4b26a0b8ab..0000000000 Binary files a/doc/common/figures/Images.png and /dev/null differ diff --git a/doc/common/figures/InstanceReady.png b/doc/common/figures/InstanceReady.png deleted file mode 100644 index 3e7ebfe74a..0000000000 Binary files a/doc/common/figures/InstanceReady.png and /dev/null differ diff --git a/doc/common/figures/KeyPair.png b/doc/common/figures/KeyPair.png deleted file mode 100644 index a29933ba7d..0000000000 Binary files a/doc/common/figures/KeyPair.png and /dev/null differ diff --git a/doc/common/figures/LaunchInstance.png b/doc/common/figures/LaunchInstance.png deleted file mode 100644 index d072e62a97..0000000000 Binary files a/doc/common/figures/LaunchInstance.png and /dev/null differ diff --git a/doc/common/figures/Login-OpenStack-Dashboard.png b/doc/common/figures/Login-OpenStack-Dashboard.png deleted file mode 100644 index 3d0452088a..0000000000 Binary files a/doc/common/figures/Login-OpenStack-Dashboard.png and /dev/null differ diff --git a/doc/common/figures/MultiInterfaceOutbound_1.png b/doc/common/figures/MultiInterfaceOutbound_1.png deleted file mode 100644 index 41f6fff4a0..0000000000 Binary files a/doc/common/figures/MultiInterfaceOutbound_1.png and /dev/null differ diff --git a/doc/common/figures/MultiInterfaceOutbound_2.png b/doc/common/figures/MultiInterfaceOutbound_2.png deleted file mode 100644 index ec036f4f4d..0000000000 Binary files a/doc/common/figures/MultiInterfaceOutbound_2.png and /dev/null differ diff --git a/doc/common/figures/NOVA_ARCH.png b/doc/common/figures/NOVA_ARCH.png deleted file mode 100644 index d340726526..0000000000 Binary files a/doc/common/figures/NOVA_ARCH.png and /dev/null differ diff --git a/doc/common/figures/NOVA_ARCH.svg b/doc/common/figures/NOVA_ARCH.svg deleted file mode 100644 index b1cce6e44d..0000000000 --- a/doc/common/figures/NOVA_ARCH.svg +++ /dev/null @@ -1,5884 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - AMQP - Messaging(RabbitMQ) - - - - nova-api - (Public API server) - - - - nova-api - (Public API server) - - - - - - - - - - - Internet - - - - Cloud users - Using tools to managevirtual guests - - - - - - - - - - - - - - - Admin network - - - - Internet EndUsers - Using services providedby virtual guests - - - - - - - - - - - - Publicnetwork - - - - - - - - - Disk Images - for Virtual Guests - - - - - - - - - Virtual Guests - Running in the cloud - - - - nova-compute - (uses libvirt or XenAPI to manage guests) - - - - User authorisation - (SQL, LDAP or fake LDAP using ReDIS) - - - - - - - - - - nova-network - manages cloud networks, vlans and bridges - - - - - - - cinder-volume - disk images for v. guests(filesystem or AoE) - - - - - - - nova-objectstore - (implements S3-like apiUsing Files or (later) Swift - - - - - nova-scheduler - Plans where to place new guests - - - - - diff --git a/doc/common/figures/NOVA_install_arch.png b/doc/common/figures/NOVA_install_arch.png deleted file mode 100644 index c7318156fb..0000000000 Binary files a/doc/common/figures/NOVA_install_arch.png and /dev/null differ diff --git a/doc/common/figures/NOVA_install_arch.svg b/doc/common/figures/NOVA_install_arch.svg deleted file mode 100644 index 38eef82485..0000000000 --- a/doc/common/figures/NOVA_install_arch.svg +++ /dev/null @@ -1,15676 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - David Pravec <alekibango@danix.org> - - - - - released under terms of Apache License - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Networ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ROUTERIP: 192.168.12.10 - SWITCHIP: 192.168.12.10 - KVM SWITCHIP: 192.168.12.10 - VPN-GWIP: 192.168.12.10 - BALANCERIP: 192.168.12.10 - FIREWALLIP: 192.168.12.10 - CARP (virtual IP)IP: 192.168.12.10 - CABLE connectionIP: 192.168.12.10 - rfIBER connectionIP: 192.168.12.10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WEB SERVERIP: 192.168.12.10 - DB SERVERIP: 192.168.12.10 - MAIL SERVERIP: 192.168.12.10 - FTP SERVERIP: 192.168.12.10 - DOC SERVER (storage)IP: 192.168.12.10 - VIRTUAL SERVERIP: 192.168.12.10 - MONITOR SERVERIP: 192.168.12.10 - SPAREIP: 192.168.12.10 - APP SERVERIP: 192.168.12.10 - DW SERVERIP: 192.168.12.10 - SMS OPERATOREIP: 192.168.12.10 - INFO CLIENTEIP: 192.168.12.10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - P gina-1 - - - Hoja.14 - - - - Hoja.2 - - Box - - - - - - - Box.3 - - - - - - - Hoja.4 - - - - Hoja.5 - - - - Box.6 - - - - - - - Hoja.7 - - - - Hoja.8 - - - - Box.9 - - - - - - - Box.10 - - - - - - - Box.11 - - - - - - - Hoja.12 - - - - Hoja.13 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OpenStack Compute services Database server on second node - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Internet - - Cloud of 2-4 virtual servers in one clusterSelf-contained storage of virtual images - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Router Private Switch Public Switch - - diff --git a/doc/common/figures/NetworkTypes.png b/doc/common/figures/NetworkTypes.png deleted file mode 100644 index 2acc93ba0a..0000000000 Binary files a/doc/common/figures/NetworkTypes.png and /dev/null differ diff --git a/doc/common/figures/NetworkTypes.svg b/doc/common/figures/NetworkTypes.svg deleted file mode 100644 index 66db9ac562..0000000000 --- a/doc/common/figures/NetworkTypes.svg +++ /dev/null @@ -1,20368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - PhysicalNetwork - - Tenant Network 1 - - - - Tenant Network 2 - - - - - - - - - - - Compute Node - - VM1 - - VM2 - - VM3 - - VM4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Provider Network - - - - - - - - - - - - - Neutron Router - Network Node - - diff --git a/doc/common/figures/Neutron-PhysNet-Diagram.odp b/doc/common/figures/Neutron-PhysNet-Diagram.odp deleted file mode 100644 index 7605b8e782..0000000000 Binary files a/doc/common/figures/Neutron-PhysNet-Diagram.odp and /dev/null differ diff --git a/doc/common/figures/Neutron-PhysNet-Diagram.png b/doc/common/figures/Neutron-PhysNet-Diagram.png deleted file mode 100644 index a854f2f177..0000000000 Binary files a/doc/common/figures/Neutron-PhysNet-Diagram.png and /dev/null differ diff --git a/doc/common/figures/OVStunneling.png b/doc/common/figures/OVStunneling.png deleted file mode 100644 index 6b69959d52..0000000000 Binary files a/doc/common/figures/OVStunneling.png and /dev/null differ diff --git a/doc/common/figures/OVStunneling.svg b/doc/common/figures/OVStunneling.svg deleted file mode 100644 index a7dbcdb709..0000000000 --- a/doc/common/figures/OVStunneling.svg +++ /dev/null @@ -1,20577 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HOST1192.168.1.10 - - Instance - - Virtual bridgeOVS-BR0 - - Open vSwitch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HOST2192.168.1.11 - - - - - - - - - - - - Physicalswitch - - Instance - - Virtual bridgeOVS-BR0 - - Open vSwitch - - VXLAN tunnel - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png b/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png deleted file mode 100644 index 8822640d2a..0000000000 Binary files a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.png and /dev/null differ diff --git a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg b/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg deleted file mode 100644 index a8fc35ba32..0000000000 --- a/doc/common/figures/SCH_5002_V00_NUAC-Keystone.svg +++ /dev/null @@ -1,2063 +0,0 @@ - - - -Schéma Réseauimage/svg+xmlSchéma RéseauVBackground-1SolidNone Status bar item.7KeystoneKeystone -Status bar item.19EndpointEndpoint -Status bar item.46ServiceService -Status bar itemUser/ APIUser/ API -Status bar item.89ServiceService -Status bar item.22User/ APIUser/ API -Status bar item.104User/ APIUser/ API -Status bar item.13KeystoneKeystone -Sheet.91Sheet.26Sheet.116Sheet.54Sheet.57The Temporary Token is provided along the requestThe Temporary Token is provided along the request -KeySheet.70Sheet.71Sheet.72Sheet.73Sheet.74Sheet.75ContactUser.50Add list item permissionsNetworkSheet.67Sheet.3Sheet.38Sheet.173- Keystone provides Alice with a list of services3. Keystone provides user with a list of services -Sheet.79Sheet.86Sheet.494- The service verifies Alice’s token4. The service verifies the user's token -Network.80Sheet.53Sheet.59The Keystone Identity ManagerThe Keystone Identity Manager -Sheet.515- Keystone provides extra info along with the token5. Keystone provides extra information and the token -ConfigureUser.95Sheet.11Sheet.68Sheet.69A Temporary Token is createdA Temporary Token is created -KeySheet.61Sheet.62Sheet.63Sheet.64Sheet.65Sheet.66Sheet.502- Alice requests all the tenants she has2. User requests their tenant information -Contact.102User.105Sheet.6Sheet.43Credentials are sentCredentials are sent -Sheet.94Sheet.21- Alice wants to launch an instance1. User wants to launch an instance -Contact.106Sheet.109Sheet.32Sheet.41Is the Token correct ?Is the Token correct ? -Sheet.25Search.33Sheet.31Sheet.76Sheet.35Sheet.24Does it allow that service usage ?Does it allow that service usage ? -Sheet.23Search.33Sheet.33Sheet.206- The service executes the request6. The service executes the request -Sheet.297- The service reports the status back to Alice7. The service reports the status back to the user -Sheet.30Sheet.44The instance is reachable hereThe instance is reachable here -Sheet.112Sheet.12Sheet.55Alice determines the correct endpoint to launch an instanceAlice determines the correct endpoint to launch an instance -LinkSheet.118Sheet.120Alice’s tenant is authorized to access the serviceAlice’s tenant is authorized to access the service -Sheet.117The token matches with the requestThe token matches with the request -Sheet.81Sheet.99A generic catalog is sentA generic catalog is sent -Sheet.78Sheet.52DocumentSheet.37Sheet.82Sheet.9Discussion.45Sheet.27Sheet.56The token is provided along the requestThe token is provided along the request -Sheet.48Sheet.83LockSheet.40Sheet.34The instance has been createdThe instance has been created -Sheet.39Sheet.85NewSheet.87Sheet.88That token belongs to the user AliceThat token belongs to the user Alice -Sheet.100Status bar item.96ServiceService -Sheet.98The service validates the request against its own policyThe service validates the request against its own policy -Sheet.101Sheet.110Sheet.111Keystone provides a list of services for the tenantKeystone sends a list of -available services -Sheet.128Sheet.124DocumentSheet.90Sheet.92The tenant token is providedThe tenant token is provided -Sheet.122Sheet.121LockNetwork.123Sheet.4Sheet.93The service creates a new instanceThe service creates a new instance -Sheet.129Sheet.130A list of tenants is sentA list of tenants is sent -Sheet.131Sheet.132DocumentSheet.134Sheet.135Sheet.136Credentials are sent with the desired tenantCredentials are sent -with desired tenant -Sheet.137Sheet.138Sheet.139Discussion.45 \ No newline at end of file diff --git a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.png b/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.png deleted file mode 100644 index e84d174652..0000000000 Binary files a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.png and /dev/null differ diff --git a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg b/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg deleted file mode 100644 index 7753791aa4..0000000000 --- a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.svg +++ /dev/null @@ -1,2131 +0,0 @@ - - - - - Schéma Réseau - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VBackground-1 - - - Solid - - - - - - - - - - None - - - - - - - - - - - Page-1 - - - - - - Oblique connector.466 - - - - - - - - - - - - - - - - - - Oblique connector.527 - - - - - - - - - - - - - - - - - - Oblique connector.528 - - - - - - - - - - - - - - - - - - Oblique connector.529 - - - - - - - - - - - - - - - - - - Oblique connector.530 - - - - - - - - - - - - - - - - - - Oblique connector.531 - - - - - - - - - - - - - - - - - - Oblique connector.532 - - - - - - - - - - - - - - - - - - Oblique connector.533 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Server.1 - NOVA-VOLUME --volume_driver=nova.volume.driver.SheepdogDriver - - Sheet.2 - - - - Sheet.3 - - - - - Sheet.4 - - - - - Sheet.5 - - - - Sheet.6 - - - - Sheet.7 - - - - Sheet.8 - - - - - - Sheet.9 - - Sheet.10 - - - - Sheet.11 - - - - Sheet.12 - - - - Sheet.13 - - - - Sheet.14 - - - - Sheet.15 - - - - - - - NOVA-VOLUME--volume_driver=nova.volume.driver.SheepdogDriver - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - File server.505 - GLANCE --image_service=nova.image.glance.GlanceImageService -... - - Sheet.506 - - - - - Sheet.507 - - - - - Sheet.508 - - - - - Sheet.509 - - - - Sheet.510 - - - - Sheet.511 - - - - Sheet.512 - - - - - - Sheet.513 - - Sheet.514 - - - - Sheet.515 - - - - Sheet.516 - - - - Sheet.517 - - - - Sheet.518 - - - - Sheet.519 - - - - - - - - Sheet.520 - - Sheet.521 - - - - Sheet.522 - - - - Sheet.523 - - - - Sheet.524 - - - - Sheet.525 - - - - - - - GLANCE--image_service=nova.image.glance.GlanceImageService--glance_api_servers=$nova_glance_host--s3_host=$nova_glance_host - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Server.51 - NOVA-SCHEDULER --rabbit_host=$nova_rabbit_host - - Sheet.52 - - - - Sheet.54 - - - - - Sheet.56 - - - - - Sheet.89 - - - - Sheet.90 - - - - Sheet.91 - - - - Sheet.92 - - - - - - Sheet.93 - - Sheet.94 - - - - Sheet.95 - - - - Sheet.96 - - - - Sheet.97 - - - - Sheet.98 - - - - Sheet.99 - - - - - - - NOVA-SCHEDULER--rabbit_host=$nova_rabbit_host - - - - - - Document - Nova.conf - - Sheet.24 - - - - Sheet.25 - - - - Sheet.26 - - - - Sheet.27 - - - - Sheet.28 - - - - Sheet.29 - - - - Sheet.30 - - - - Sheet.31 - - - - Sheet.32 - - - - Sheet.33 - - - - Sheet.34 - - - - Sheet.35 - - - - - - Nova.conf - - - - - - - - - - - - - - - - - - Data - - Sheet.38 - - - - Sheet.39 - - - - Sheet.40 - - - - - Sheet.41 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web server - NOVA-API --ec2_url=http://$nova_api_host:8773/services/Cloud - - Sheet.42 - - - - Sheet.43 - - - - - Sheet.44 - - - - - Sheet.45 - - - - Sheet.46 - - - - Sheet.47 - - - - Sheet.48 - - - - - - Sheet.49 - - Sheet.50 - - - - Sheet.53 - - - - Sheet.55 - - - - Sheet.57 - - - - Sheet.58 - - - - Sheet.59 - - - - - - - - Sheet.60 - - Sheet.61 - - Sheet.62 - - - - - Sheet.63 - - - - - Sheet.64 - - - - - - - - NOVA-API--ec2_url=http://$nova_api_host:8773/services/Cloud - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Directory server - NOVA-LDAP --auth_driver=nova.auth.ldapdriver.LdapDriver --lda... - - Sheet.66 - - - - Sheet.67 - - - - - Sheet.68 - - - - - Sheet.69 - - - - Sheet.70 - - - - Sheet.71 - - - - Sheet.72 - - - - - - Sheet.73 - - Sheet.74 - - - - Sheet.75 - - - - Sheet.76 - - - - Sheet.77 - - - - Sheet.78 - - - - Sheet.79 - - - - - - - - Sheet.80 - - Sheet.81 - - - - Sheet.82 - - - - Sheet.83 - - - - Sheet.84 - - - - - - - - Sheet.85 - - - - Sheet.86 - - - - - - Sheet.87 - - - - - - - NOVA-LDAP--auth_driver=nova.auth.ldapdriver.LdapDriver--ldap_url=ldap://$nova_ldap_host--ldap_password=$nova_ldap_user_pass--ldap_user_dn=$nova_ldap_user_dn--ldap_user_unit=people--ldap_user_subtree=ou=people,$nova_ldap_base_dn--ldap_project_subtree=ou=groups,$nova_ldap_base_dn--role_project_subtree=ou=groups,$nova_ldap_base_dn--ldap_cloudadmin=cn=cloudadmins,ou=groups,$nova_ldap_base_dn--ldap_itsec=cn=itsec,ou=groups,$nova_ldap_base_dn--ldap_sysadmin=cn=sysadmins,$nova_ldap_base_dn--ldap_netadmin=cn=netadmins,$nova_ldap_base_dn--ldap_developer=cn=developers,$nova_ldap_base_dn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Application server.57 - NOVA-COMPUTE --libvirt_type=kvm --ajax_console_proxy_url=$nov... - - Sheet.88 - - - - Sheet.104 - - Sheet.105 - - - - - Sheet.106 - - - - - Sheet.107 - - - - Sheet.119 - - - - Sheet.120 - - - - Sheet.121 - - - - - - Sheet.122 - - Sheet.123 - - - - Sheet.124 - - - - Sheet.125 - - - - Sheet.126 - - - - Sheet.127 - - - - Sheet.128 - - - - - - Sheet.129 - - Sheet.130 - - - - - Sheet.131 - - - - - Sheet.132 - - - - Sheet.133 - - - - Sheet.134 - - - - Sheet.135 - - - - - - Sheet.136 - - Sheet.137 - - - - Sheet.138 - - - - Sheet.139 - - - - Sheet.140 - - - - Sheet.141 - - - - Sheet.142 - - - - - - Sheet.143 - - Sheet.144 - - - - - Sheet.145 - - - - - Sheet.146 - - - - Sheet.147 - - - - Sheet.148 - - - - Sheet.149 - - - - - - Sheet.150 - - Sheet.151 - - - - Sheet.152 - - - - Sheet.153 - - - - Sheet.154 - - - - Sheet.155 - - - - Sheet.156 - - - - - - Sheet.157 - - Sheet.158 - - - - - Sheet.159 - - - - - Sheet.160 - - - - Sheet.161 - - - - Sheet.162 - - - - Sheet.163 - - - - - - Sheet.164 - - Sheet.165 - - - - Sheet.166 - - - - Sheet.167 - - - - Sheet.168 - - - - Sheet.169 - - - - Sheet.170 - - - - - - - - NOVA-COMPUTE--libvirt_type=kvm--ajax_console_proxy_url=$nova_ajax_proxy_url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Database server - MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n... - - Sheet.172 - - - - Sheet.173 - - - - - Sheet.174 - - - - - Sheet.175 - - - - Sheet.176 - - - - Sheet.177 - - - - Sheet.178 - - - - - - Sheet.179 - - Sheet.180 - - - - Sheet.181 - - - - Sheet.182 - - - - Sheet.183 - - - - Sheet.184 - - - - Sheet.185 - - - - - - - - Sheet.186 - - Sheet.187 - - - - Sheet.188 - - - - Sheet.189 - - - - - - - MySQL--sql_connection=mysql://$nova_db_user:$nova_db_pass@$nova_db_host/$nova_db_name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Proxy server - NOVA-NETWORK --network_host=$nova_network_host --dhcpbridge=/... - - Sheet.191 - - - - Sheet.192 - - - - - Sheet.193 - - - - - Sheet.194 - - - - Sheet.195 - - - - Sheet.196 - - - - Sheet.197 - - - - - - Sheet.198 - - Sheet.199 - - - - Sheet.200 - - - - Sheet.201 - - - - Sheet.202 - - - - Sheet.203 - - - - Sheet.204 - - - - - - - - Sheet.205 - - Sheet.206 - - - - Sheet.207 - - - - - - - - - - - - - - - - - Sheet.208 - - - - - - - NOVA-NETWORK--network_host=$nova_network_host--dhcpbridge=/usr/bin/nova-dhcpbridge--flat_network_bridge=br100--network_manager=nova.network.manager.FlatDHCPManager--flat_interface=$nova_network_flat_interface--public_interface=$nova_network_public_interface--routing_source_ip=$nova_network_public_ip - - - diff --git a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.vsd b/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.vsd deleted file mode 100644 index 7e1a2a5048..0000000000 Binary files a/doc/common/figures/SCH_5003_V00_NUAC-Network_mode_KVM_LDAP_OpenStack.vsd and /dev/null differ diff --git a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png b/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png deleted file mode 100644 index ac68d4d331..0000000000 Binary files a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png and /dev/null differ diff --git a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg b/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg deleted file mode 100644 index 079a56f92c..0000000000 --- a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.svg +++ /dev/null @@ -1,1833 +0,0 @@ - - - - - Schéma Réseau - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VBackground-1 - - - Solid - - - - - - - - - - None - - - - - - - - - - - Page-1 - - - - - - Oblique connector.466 - - - - - - - - - - - - - - - - - - Oblique connector.527 - - - - - - - - - - - - - - - - - - Oblique connector.528 - - - - - - - - - - - - - - - - - - Oblique connector.530 - - - - - - - - - - - - - - - - - - Oblique connector.531 - - - - - - - - - - - - - - - - - - Oblique connector.532 - - - - - - - - - - - - - - - - - - Oblique connector.533 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Server.1 - CINDER-VOLUME - - Sheet.2 - - - - Sheet.3 - - - - - Sheet.4 - - - - - Sheet.5 - - - - Sheet.6 - - - - Sheet.7 - - - - Sheet.8 - - - - - - Sheet.9 - - Sheet.10 - - - - Sheet.11 - - - - Sheet.12 - - - - Sheet.13 - - - - Sheet.14 - - - - Sheet.15 - - - - - - - NOVA-VOLUME--iscsi_ip_prefix=nnn.nnn.nnn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - File server.505 - GLANCE --image_service=nova.image.glance.GlanceImageService -... - - Sheet.506 - - - - - Sheet.507 - - - - - Sheet.508 - - - - - Sheet.509 - - - - Sheet.510 - - - - Sheet.511 - - - - Sheet.512 - - - - - - Sheet.513 - - Sheet.514 - - - - Sheet.515 - - - - Sheet.516 - - - - Sheet.517 - - - - Sheet.518 - - - - Sheet.519 - - - - - - - - Sheet.520 - - Sheet.521 - - - - Sheet.522 - - - - Sheet.523 - - - - Sheet.524 - - - - Sheet.525 - - - - - - - GLANCE--image_service=nova.image.glance.GlanceImageService--glance_api_servers=$nova_glance_host--s3_host=$nova_glance_host - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Server.51 - NOVA-SCHEDULER --rabbit_host=$nova_rabbit_host - - Sheet.52 - - - - Sheet.54 - - - - - Sheet.56 - - - - - Sheet.89 - - - - Sheet.90 - - - - Sheet.91 - - - - Sheet.92 - - - - - - Sheet.93 - - Sheet.94 - - - - Sheet.95 - - - - Sheet.96 - - - - Sheet.97 - - - - Sheet.98 - - - - Sheet.99 - - - - - - - NOVA-SCHEDULER--rabbit_host=$nova_rabbit_host - - - - - - Document - Nova.conf - - Sheet.24 - - - - Sheet.25 - - - - Sheet.26 - - - - Sheet.27 - - - - Sheet.28 - - - - Sheet.29 - - - - Sheet.30 - - - - Sheet.31 - - - - Sheet.32 - - - - Sheet.33 - - - - Sheet.34 - - - - Sheet.35 - - - - - - Nova.conf - - - - - - - - - - - - - - - - - - Data - - Sheet.38 - - - - Sheet.39 - - - - Sheet.40 - - - - - Sheet.41 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web server - NOVA-API --ec2_url=http://$nova_api_host:8773/services/Cloud - - Sheet.42 - - - - Sheet.43 - - - - - Sheet.44 - - - - - Sheet.45 - - - - Sheet.46 - - - - Sheet.47 - - - - Sheet.48 - - - - - - Sheet.49 - - Sheet.50 - - - - Sheet.53 - - - - Sheet.55 - - - - Sheet.57 - - - - Sheet.58 - - - - Sheet.59 - - - - - - - - Sheet.60 - - Sheet.61 - - Sheet.62 - - - - - Sheet.63 - - - - - Sheet.64 - - - - - - - - NOVA-API--ec2_url=http://$nova_api_host:8773/services/Cloud - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Application server.57 - NOVA-COMPUTE --libvirt_type=kvm --ajax_console_proxy_url=$nov... - - Sheet.88 - - - - Sheet.104 - - Sheet.105 - - - - - Sheet.106 - - - - - Sheet.107 - - - - Sheet.119 - - - - Sheet.120 - - - - Sheet.121 - - - - - - Sheet.122 - - Sheet.123 - - - - Sheet.124 - - - - Sheet.125 - - - - Sheet.126 - - - - Sheet.127 - - - - Sheet.128 - - - - - - Sheet.129 - - Sheet.130 - - - - - Sheet.131 - - - - - Sheet.132 - - - - Sheet.133 - - - - Sheet.134 - - - - Sheet.135 - - - - - - Sheet.136 - - Sheet.137 - - - - Sheet.138 - - - - Sheet.139 - - - - Sheet.140 - - - - Sheet.141 - - - - Sheet.142 - - - - - - Sheet.143 - - Sheet.144 - - - - - Sheet.145 - - - - - Sheet.146 - - - - Sheet.147 - - - - Sheet.148 - - - - Sheet.149 - - - - - - Sheet.150 - - Sheet.151 - - - - Sheet.152 - - - - Sheet.153 - - - - Sheet.154 - - - - Sheet.155 - - - - Sheet.156 - - - - - - Sheet.157 - - Sheet.158 - - - - - Sheet.159 - - - - - Sheet.160 - - - - Sheet.161 - - - - Sheet.162 - - - - Sheet.163 - - - - - - Sheet.164 - - Sheet.165 - - - - Sheet.166 - - - - Sheet.167 - - - - Sheet.168 - - - - Sheet.169 - - - - Sheet.170 - - - - - - - - NOVA-COMPUTE--libvirt_type=kvm--ajax_console_proxy_url=$nova_ajax_proxy_url - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Database server - MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n... - - Sheet.172 - - - - Sheet.173 - - - - - Sheet.174 - - - - - Sheet.175 - - - - Sheet.176 - - - - Sheet.177 - - - - Sheet.178 - - - - - - Sheet.179 - - Sheet.180 - - - - Sheet.181 - - - - Sheet.182 - - - - Sheet.183 - - - - Sheet.184 - - - - Sheet.185 - - - - - - - - Sheet.186 - - Sheet.187 - - - - Sheet.188 - - - - Sheet.189 - - - - - - - MySQL--sql_connection=mysql://$nova_db_user:$nova_db_pass@$nova_db_host/$nova_db_name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Proxy server - NOVA-NETWORK --dhcpbridge_flagfile=/etc/nova/nova.conf --dhcp... - - Sheet.191 - - - - Sheet.192 - - - - - Sheet.193 - - - - - Sheet.194 - - - - Sheet.195 - - - - Sheet.196 - - - - Sheet.197 - - - - - - Sheet.198 - - Sheet.199 - - - - Sheet.200 - - - - Sheet.201 - - - - Sheet.202 - - - - Sheet.203 - - - - Sheet.204 - - - - - - - - Sheet.205 - - Sheet.206 - - - - Sheet.207 - - - - - - - - - - - - - - - - - Sheet.208 - - - - - - - NOVA-NETWORK--dhcpbridge_flagfile=/etc/nova/nova.conf--dhcpbridge=/usr/bin/nova-dhcpbridge--flat_network_bridge=br100--network_manager=nova.network.manager.FlatManager - - - diff --git a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.vsd b/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.vsd deleted file mode 100644 index f1cff06926..0000000000 Binary files a/doc/common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.vsd and /dev/null differ diff --git a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png b/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png deleted file mode 100644 index 3e2ad99129..0000000000 Binary files a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png and /dev/null differ diff --git a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg b/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg deleted file mode 100644 index 73c27a2929..0000000000 --- a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.svg +++ /dev/null @@ -1,1453 +0,0 @@ - - - - - Schéma Réseau - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VBackground-1 - - - Solid - - - - - - - - - - None - - - - - - - - - - - Page-1 - - - - - - Oblique connector.466 - - - - - - - - - - - - - - - - - - Oblique connector.527 - - - - - - - - - - - - - - - - - - Oblique connector.528 - - - - - - - - - - - - - - - - - - Oblique connector.532 - - - - - - - - - - - - - - - - - - Oblique connector.533 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - File server.505 - GLANCE --image_service=nova.image.glance.GlanceImageService -... - - Sheet.506 - - - - - Sheet.507 - - - - - Sheet.508 - - - - - Sheet.509 - - - - Sheet.510 - - - - Sheet.511 - - - - Sheet.512 - - - - - - Sheet.513 - - Sheet.514 - - - - Sheet.515 - - - - Sheet.516 - - - - Sheet.517 - - - - Sheet.518 - - - - Sheet.519 - - - - - - - - Sheet.520 - - Sheet.521 - - - - Sheet.522 - - - - Sheet.523 - - - - Sheet.524 - - - - Sheet.525 - - - - - - - GLANCE--image_service=nova.image.glance.GlanceImageService--glance_api_servers=$nova_glance_host--s3_host=$nova_glance_host - - - - - - Document - Nova.conf - - Sheet.24 - - - - Sheet.25 - - - - Sheet.26 - - - - Sheet.27 - - - - Sheet.28 - - - - Sheet.29 - - - - Sheet.30 - - - - Sheet.31 - - - - Sheet.32 - - - - Sheet.33 - - - - Sheet.34 - - - - Sheet.35 - - - - - - Nova.conf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Web server - NOVA-API --ec2_url=http://$nova_api_host:8773/services/Cloud ... - - Sheet.42 - - - - Sheet.43 - - - - - Sheet.44 - - - - - Sheet.45 - - - - Sheet.46 - - - - Sheet.47 - - - - Sheet.48 - - - - - - Sheet.49 - - Sheet.50 - - - - Sheet.53 - - - - Sheet.55 - - - - Sheet.57 - - - - Sheet.58 - - - - Sheet.59 - - - - - - - - Sheet.60 - - Sheet.61 - - Sheet.62 - - - - - Sheet.63 - - - - - Sheet.64 - - - - - - - - NOVA-API--ec2_url=http://$nova_api_host:8773/services/Cloud--allow_admin_api=true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Application server.57 - NOVA-COMPUTE --compute_driver=xenapi.XenAPIDriver --xenapi_connection_url... - - Sheet.88 - - - - Sheet.104 - - Sheet.105 - - - - - Sheet.106 - - - - - Sheet.107 - - - - Sheet.119 - - - - Sheet.120 - - - - Sheet.121 - - - - - - Sheet.122 - - Sheet.123 - - - - Sheet.124 - - - - Sheet.125 - - - - Sheet.126 - - - - Sheet.127 - - - - Sheet.128 - - - - - - Sheet.129 - - Sheet.130 - - - - - Sheet.131 - - - - - Sheet.132 - - - - Sheet.133 - - - - Sheet.134 - - - - Sheet.135 - - - - - - Sheet.136 - - Sheet.137 - - - - Sheet.138 - - - - Sheet.139 - - - - Sheet.140 - - - - Sheet.141 - - - - Sheet.142 - - - - - - Sheet.143 - - Sheet.144 - - - - - Sheet.145 - - - - - Sheet.146 - - - - Sheet.147 - - - - Sheet.148 - - - - Sheet.149 - - - - - - Sheet.150 - - Sheet.151 - - - - Sheet.152 - - - - Sheet.153 - - - - Sheet.154 - - - - Sheet.155 - - - - Sheet.156 - - - - - - Sheet.157 - - Sheet.158 - - - - - Sheet.159 - - - - - Sheet.160 - - - - Sheet.161 - - - - Sheet.162 - - - - Sheet.163 - - - - - - Sheet.164 - - Sheet.165 - - - - Sheet.166 - - - - Sheet.167 - - - - Sheet.168 - - - - Sheet.169 - - - - Sheet.170 - - - - - - - - NOVA-COMPUTE--connection_type=xenapi--xenapi_connection_url=https://<XenServer IP>--xenapi_connection_username=root--xenapi_connection_password=supersecret--rescue_timeout=86400 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Database server - MySQL --sql_connection=mysql+pymysql://$nova_db_user:$nova_db_pass@$n... - - Sheet.172 - - - - Sheet.173 - - - - - Sheet.174 - - - - - Sheet.175 - - - - Sheet.176 - - - - Sheet.177 - - - - Sheet.178 - - - - - - Sheet.179 - - Sheet.180 - - - - Sheet.181 - - - - Sheet.182 - - - - Sheet.183 - - - - Sheet.184 - - - - Sheet.185 - - - - - - - - Sheet.186 - - Sheet.187 - - - - Sheet.188 - - - - Sheet.189 - - - - - - - MySQL--sql_connection=mysql://$nova_db_user:$nova_db_pass@$nova_db_host/$nova_db_name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Proxy server - NOVA-NETWORK --network_manager=nova.network.manager.FlatManag... - - Sheet.191 - - - - Sheet.192 - - - - - Sheet.193 - - - - - Sheet.194 - - - - Sheet.195 - - - - Sheet.196 - - - - Sheet.197 - - - - - - Sheet.198 - - Sheet.199 - - - - Sheet.200 - - - - Sheet.201 - - - - Sheet.202 - - - - Sheet.203 - - - - Sheet.204 - - - - - - - - Sheet.205 - - Sheet.206 - - - - Sheet.207 - - - - - - - - - - - - - - - - - Sheet.208 - - - - - - - NOVA-NETWORK--network_manager=nova.network.manager.FlatManager--flat_network_bridge=xenbr0--flat_injected=true--ipv6_backend=account_identifier - - - diff --git a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.vsd b/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.vsd deleted file mode 100644 index 9bbb05bd35..0000000000 Binary files a/doc/common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.vsd and /dev/null differ diff --git a/doc/common/figures/Security-Group.png b/doc/common/figures/Security-Group.png deleted file mode 100644 index 9cc6cb7cbc..0000000000 Binary files a/doc/common/figures/Security-Group.png and /dev/null differ diff --git a/doc/common/figures/SingleInterfaceOutbound_1.png b/doc/common/figures/SingleInterfaceOutbound_1.png deleted file mode 100644 index 2d9506c3e0..0000000000 Binary files a/doc/common/figures/SingleInterfaceOutbound_1.png and /dev/null differ diff --git a/doc/common/figures/SingleInterfaceOutbound_2.png b/doc/common/figures/SingleInterfaceOutbound_2.png deleted file mode 100644 index 4925db0346..0000000000 Binary files a/doc/common/figures/SingleInterfaceOutbound_2.png and /dev/null differ diff --git a/doc/common/figures/UseCase-MixedFlatPrivate.png b/doc/common/figures/UseCase-MixedFlatPrivate.png deleted file mode 100644 index 6391845cb6..0000000000 Binary files a/doc/common/figures/UseCase-MixedFlatPrivate.png and /dev/null differ diff --git a/doc/common/figures/UseCase-MultiFlat.png b/doc/common/figures/UseCase-MultiFlat.png deleted file mode 100644 index 9e02a40311..0000000000 Binary files a/doc/common/figures/UseCase-MultiFlat.png and /dev/null differ diff --git a/doc/common/figures/UseCase-MultiRouter.png b/doc/common/figures/UseCase-MultiRouter.png deleted file mode 100644 index 610d511210..0000000000 Binary files a/doc/common/figures/UseCase-MultiRouter.png and /dev/null differ diff --git a/doc/common/figures/UseCase-SingleFlat.png b/doc/common/figures/UseCase-SingleFlat.png deleted file mode 100644 index d648973b81..0000000000 Binary files a/doc/common/figures/UseCase-SingleFlat.png and /dev/null differ diff --git a/doc/common/figures/UseCase-SingleRouter.png b/doc/common/figures/UseCase-SingleRouter.png deleted file mode 100644 index 0beed5b218..0000000000 Binary files a/doc/common/figures/UseCase-SingleRouter.png and /dev/null differ diff --git a/doc/common/figures/XenApiFlatDHCPMultInterfaceHA.png b/doc/common/figures/XenApiFlatDHCPMultInterfaceHA.png deleted file mode 100644 index 26835a1927..0000000000 Binary files a/doc/common/figures/XenApiFlatDHCPMultInterfaceHA.png and /dev/null differ diff --git a/doc/common/figures/XenApiVLANMultInterfaceHA.png b/doc/common/figures/XenApiVLANMultInterfaceHA.png deleted file mode 100644 index d7045fcfe1..0000000000 Binary files a/doc/common/figures/XenApiVLANMultInterfaceHA.png and /dev/null differ diff --git a/doc/common/figures/XenServerDiagrams.vsd b/doc/common/figures/XenServerDiagrams.vsd deleted file mode 100644 index 27c214a083..0000000000 Binary files a/doc/common/figures/XenServerDiagrams.vsd and /dev/null differ diff --git a/doc/common/figures/access_security.png b/doc/common/figures/access_security.png deleted file mode 100644 index f22fc71a27..0000000000 Binary files a/doc/common/figures/access_security.png and /dev/null differ diff --git a/doc/common/figures/change_instance_state.png b/doc/common/figures/change_instance_state.png deleted file mode 100644 index 3c0b73b836..0000000000 Binary files a/doc/common/figures/change_instance_state.png and /dev/null differ diff --git a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step1.jpg b/doc/common/figures/cloudpipe/cloudpipe-viscosity-step1.jpg deleted file mode 100644 index 24ef790b2c..0000000000 Binary files a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step1.jpg and /dev/null differ diff --git a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step2.jpg b/doc/common/figures/cloudpipe/cloudpipe-viscosity-step2.jpg deleted file mode 100644 index 0e1992e8b6..0000000000 Binary files a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step2.jpg and /dev/null differ diff --git a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step3.jpg b/doc/common/figures/cloudpipe/cloudpipe-viscosity-step3.jpg deleted file mode 100644 index 6f19b84c97..0000000000 Binary files a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step3.jpg and /dev/null differ diff --git a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step4.jpg b/doc/common/figures/cloudpipe/cloudpipe-viscosity-step4.jpg deleted file mode 100644 index ea8633626a..0000000000 Binary files a/doc/common/figures/cloudpipe/cloudpipe-viscosity-step4.jpg and /dev/null differ diff --git a/doc/common/figures/cyberduck_swift_connection.png b/doc/common/figures/cyberduck_swift_connection.png deleted file mode 100644 index abd6f3d450..0000000000 Binary files a/doc/common/figures/cyberduck_swift_connection.png and /dev/null differ diff --git a/doc/common/figures/cyberduck_swift_uploads.png b/doc/common/figures/cyberduck_swift_uploads.png deleted file mode 100644 index 24aaca214c..0000000000 Binary files a/doc/common/figures/cyberduck_swift_uploads.png and /dev/null differ diff --git a/doc/common/figures/dashboard-admin-tab.png b/doc/common/figures/dashboard-admin-tab.png deleted file mode 100644 index 012f3b1080..0000000000 Binary files a/doc/common/figures/dashboard-admin-tab.png and /dev/null differ diff --git a/doc/common/figures/dashboard-overview.png b/doc/common/figures/dashboard-overview.png deleted file mode 100644 index 2b369387c5..0000000000 Binary files a/doc/common/figures/dashboard-overview.png and /dev/null differ diff --git a/doc/common/figures/dashboard-project-tab.png b/doc/common/figures/dashboard-project-tab.png deleted file mode 100644 index ae951121a2..0000000000 Binary files a/doc/common/figures/dashboard-project-tab.png and /dev/null differ diff --git a/doc/common/figures/dashboard_admin_project_tab.png b/doc/common/figures/dashboard_admin_project_tab.png deleted file mode 100644 index 4ab1ea725c..0000000000 Binary files a/doc/common/figures/dashboard_admin_project_tab.png and /dev/null differ diff --git a/doc/common/figures/dashboard_quota.png b/doc/common/figures/dashboard_quota.png deleted file mode 100644 index 052a8d8123..0000000000 Binary files a/doc/common/figures/dashboard_quota.png and /dev/null differ diff --git a/doc/common/figures/demo_flat_install.png b/doc/common/figures/demo_flat_install.png deleted file mode 100644 index d9b10eb8fa..0000000000 Binary files a/doc/common/figures/demo_flat_install.png and /dev/null differ diff --git a/doc/common/figures/demo_install.png b/doc/common/figures/demo_install.png deleted file mode 100644 index f7d9f114b2..0000000000 Binary files a/doc/common/figures/demo_install.png and /dev/null differ diff --git a/doc/common/figures/demo_routers_with_private_networks.png b/doc/common/figures/demo_routers_with_private_networks.png deleted file mode 100644 index 2599808bd9..0000000000 Binary files a/doc/common/figures/demo_routers_with_private_networks.png and /dev/null differ diff --git a/doc/common/figures/emc/enabler.png b/doc/common/figures/emc/enabler.png deleted file mode 100644 index b969b81714..0000000000 Binary files a/doc/common/figures/emc/enabler.png and /dev/null differ diff --git a/doc/common/figures/filteringWorkflow1.png b/doc/common/figures/filteringWorkflow1.png deleted file mode 100644 index 58da979d79..0000000000 Binary files a/doc/common/figures/filteringWorkflow1.png and /dev/null differ diff --git a/doc/common/figures/filteringWorkflow2.png b/doc/common/figures/filteringWorkflow2.png deleted file mode 100644 index e0fe66acfe..0000000000 Binary files a/doc/common/figures/filteringWorkflow2.png and /dev/null differ diff --git a/doc/common/figures/ha-net.jpg b/doc/common/figures/ha-net.jpg deleted file mode 100644 index 302034113d..0000000000 Binary files a/doc/common/figures/ha-net.jpg and /dev/null differ diff --git a/doc/common/figures/ha-net.png b/doc/common/figures/ha-net.png deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/common/figures/horizon-screenshot.jpg b/doc/common/figures/horizon-screenshot.jpg deleted file mode 100644 index 9c2ca84097..0000000000 Binary files a/doc/common/figures/horizon-screenshot.jpg and /dev/null differ diff --git a/doc/common/figures/installguide-neutron-initialnetworks.graffle b/doc/common/figures/installguide-neutron-initialnetworks.graffle deleted file mode 100644 index b19d8bef89..0000000000 Binary files a/doc/common/figures/installguide-neutron-initialnetworks.graffle and /dev/null differ diff --git a/doc/common/figures/installguide-neutron-initialnetworks.png b/doc/common/figures/installguide-neutron-initialnetworks.png deleted file mode 100644 index cf7884b12e..0000000000 Binary files a/doc/common/figures/installguide-neutron-initialnetworks.png and /dev/null differ diff --git a/doc/common/figures/installguide-neutron-initialnetworks.svg b/doc/common/figures/installguide-neutron-initialnetworks.svg deleted file mode 100644 index 067ba1baad..0000000000 --- a/doc/common/figures/installguide-neutron-initialnetworks.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-25 13:27ZCanvas 1Layer 1 Network Node Compute NodeInterface 210.0.1.21/24Interface 210.0.1.31/24OpenStack Networking (neutron)Initial NetworksInterface 3(unnumbered)InternetTunnel network10.0.1.0/24External network203.0.113.0/24Open vSwitchSecurityGroupsOpen vSwitchTunnel Bridgebr-tunIntegration Bridgebr-intExternal Bridgebr-exExternal Networkext-netTenant Networkdemo-netTenant Subnetdemo-subnet192.168.1.0/24Gateway192.168.1.1/24External Subnetext-subnet203.0.113.0/24Gateway203.0.113.101/24Instancedemo-instance1eth0Tenant Routerdemo-routerIntegration Bridgebr-intTunnel Bridgebr-tunDHCP ServerNetwork traffic flow from instanceto external network (Internet)GRETunnelSNAT/DNAT diff --git a/doc/common/figures/installguidearch-neutron-hw.graffle b/doc/common/figures/installguidearch-neutron-hw.graffle deleted file mode 100644 index 17ec3c4cb7..0000000000 Binary files a/doc/common/figures/installguidearch-neutron-hw.graffle and /dev/null differ diff --git a/doc/common/figures/installguidearch-neutron-hw.png b/doc/common/figures/installguidearch-neutron-hw.png deleted file mode 100644 index 19b60c3987..0000000000 Binary files a/doc/common/figures/installguidearch-neutron-hw.png and /dev/null differ diff --git a/doc/common/figures/installguidearch-neutron-hw.svg b/doc/common/figures/installguidearch-neutron-hw.svg deleted file mode 100644 index 95ca4946ed..0000000000 --- a/doc/common/figures/installguidearch-neutron-hw.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-19 19:06ZCanvas 1Layer 1Controller Node Network NodeCompute Node 11-2CPUBlock Storage Node 1Object Storage Node 1Object Storage Node 2Minimal Architecture Example - Hardware RequirementsOpenStack Networking (neutron)Core componentOptional component8 GBRAM100 GBStorage1-2CPU2 GBRAM50 GBStorage2-4+CPU8+ GBRAM100+ GBStorage1-2CPU2 GBRAM1NIC3NIC2NIC1NIC1NIC4+ GBRAM1-2CPU1NIC100+ GBStorage100+ GBStorage100+ GBStorage/dev/sdb/dev/sdb/dev/sdc/dev/sdb/dev/sdc1-2CPU4+ GBRAM diff --git a/doc/common/figures/installguidearch-neutron-networks.graffle b/doc/common/figures/installguidearch-neutron-networks.graffle deleted file mode 100644 index 011c9f7460..0000000000 Binary files a/doc/common/figures/installguidearch-neutron-networks.graffle and /dev/null differ diff --git a/doc/common/figures/installguidearch-neutron-networks.png b/doc/common/figures/installguidearch-neutron-networks.png deleted file mode 100644 index 4de8d0466b..0000000000 Binary files a/doc/common/figures/installguidearch-neutron-networks.png and /dev/null differ diff --git a/doc/common/figures/installguidearch-neutron-networks.svg b/doc/common/figures/installguidearch-neutron-networks.svg deleted file mode 100644 index 2585799cea..0000000000 --- a/doc/common/figures/installguidearch-neutron-networks.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-22 21:59ZCanvas 1Layer 1 Controller Node Network Node Compute Node 1Interface 110.0.0.11/24Interface 110.0.0.21/24Interface 210.0.1.21/24Interface 110.0.0.31/24Interface 210.0.1.31/24 Block Storage Node 1 Object Storage Node 1 Object Storage Node 2Interface 110.0.0.41/24Interface 110.0.0.51/24Interface 110.0.0.52/24Minimal Architecture Example - Network LayoutOpenStack Networking (neutron)Interface 3(unnumbered)InternetManagement network10.0.0.0/24Tunnel network10.0.1.0/24External network203.0.113.0/24Core componentOptional componentInterface 310.0.2.31/24Interface 210.0.2.51/24Interface 210.0.2.52/24Interface 210.0.2.41/24Storage network10.0.2.0/24 diff --git a/doc/common/figures/installguidearch-neutron-services.graffle b/doc/common/figures/installguidearch-neutron-services.graffle deleted file mode 100644 index e82f281dae..0000000000 Binary files a/doc/common/figures/installguidearch-neutron-services.graffle and /dev/null differ diff --git a/doc/common/figures/installguidearch-neutron-services.png b/doc/common/figures/installguidearch-neutron-services.png deleted file mode 100644 index 90146793bd..0000000000 Binary files a/doc/common/figures/installguidearch-neutron-services.png and /dev/null differ diff --git a/doc/common/figures/installguidearch-neutron-services.svg b/doc/common/figures/installguidearch-neutron-services.svg deleted file mode 100644 index a0149045f5..0000000000 --- a/doc/common/figures/installguidearch-neutron-services.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-24 03:14ZCanvas 1Layer 1 Controller Node NetworkNodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesMinimal Architecture Example - Service LayoutOpenStack Networking (neutron)Core componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceDatabase ServiceData ProcessingServiceOpen vSwitchNetworkingOpen vSwitch AgentNetworkingL3 AgentNetworkingDHCP AgentNetworkingML2 Plug-in Compute NodesOpen vSwitchKVM HypervisorComputeNetworkingOpen vSwitch AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inNetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceNetworkingMetadata Agent diff --git a/doc/common/figures/installguidearch-nova-hw.graffle b/doc/common/figures/installguidearch-nova-hw.graffle deleted file mode 100644 index a9c3937c9c..0000000000 Binary files a/doc/common/figures/installguidearch-nova-hw.graffle and /dev/null differ diff --git a/doc/common/figures/installguidearch-nova-hw.png b/doc/common/figures/installguidearch-nova-hw.png deleted file mode 100644 index 745418764d..0000000000 Binary files a/doc/common/figures/installguidearch-nova-hw.png and /dev/null differ diff --git a/doc/common/figures/installguidearch-nova-hw.svg b/doc/common/figures/installguidearch-nova-hw.svg deleted file mode 100644 index 8dd667d2f9..0000000000 --- a/doc/common/figures/installguidearch-nova-hw.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-19 18:40ZCanvas 1Layer 1Controller NodeCompute Node 11-2CPUBlock Storage Node 1Object Storage Node 1Object Storage Node 2Minimal Architecture Example - Hardware RequirementsLegacy Networking (nova-network)Core componentOptional component8 GBRAM100 GBStorage2-4+CPU8+ GBRAM100+ GBStorage1-2CPU2 GBRAM1NIC2NIC1NIC1NIC4+ GBRAM1-2CPU1NIC100+ GBStorage100+ GBStorage100+ GBStorage/dev/sdb/dev/sdb/dev/sdc/dev/sdb/dev/sdc1-2CPU4+ GBRAM diff --git a/doc/common/figures/installguidearch-nova-networks.graffle b/doc/common/figures/installguidearch-nova-networks.graffle deleted file mode 100644 index 2a855b5692..0000000000 Binary files a/doc/common/figures/installguidearch-nova-networks.graffle and /dev/null differ diff --git a/doc/common/figures/installguidearch-nova-networks.png b/doc/common/figures/installguidearch-nova-networks.png deleted file mode 100644 index d92ed162dc..0000000000 Binary files a/doc/common/figures/installguidearch-nova-networks.png and /dev/null differ diff --git a/doc/common/figures/installguidearch-nova-networks.svg b/doc/common/figures/installguidearch-nova-networks.svg deleted file mode 100644 index 1510ddd006..0000000000 --- a/doc/common/figures/installguidearch-nova-networks.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-22 21:59ZCanvas 1Layer 1 Controller Node Compute Node 1Interface 110.0.0.11/24Interface 110.0.0.31/24 Block Storage Node 1 Object Storage Node 1 Object Storage Node 2Interface 110.0.0.41/24Interface 110.0.0.51/24Interface 110.0.0.52/24Minimal Architecture Example - Network LayoutLegacy Networking (nova-network)Interface 2(unnumbered)InternetManagement network10.0.0.0/24External network203.0.113.0/24Core componentOptional componentInterface 310.0.2.31/24Interface 210.0.2.51/24Interface 210.0.2.52/24Interface 210.0.2.41/24Storage network10.0.2.0/24 diff --git a/doc/common/figures/installguidearch-nova-services.graffle b/doc/common/figures/installguidearch-nova-services.graffle deleted file mode 100644 index 44771fbb30..0000000000 Binary files a/doc/common/figures/installguidearch-nova-services.graffle and /dev/null differ diff --git a/doc/common/figures/installguidearch-nova-services.png b/doc/common/figures/installguidearch-nova-services.png deleted file mode 100644 index d4d5c52441..0000000000 Binary files a/doc/common/figures/installguidearch-nova-services.png and /dev/null differ diff --git a/doc/common/figures/installguidearch-nova-services.svg b/doc/common/figures/installguidearch-nova-services.svg deleted file mode 100644 index 1a1aafc6b3..0000000000 --- a/doc/common/figures/installguidearch-nova-services.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - Produced by OmniGraffle 6.0.5 2014-11-21 18:35ZCanvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock StorageNodes ObjectStorage NodesMinimal Architecture Example - Service LayoutLegacy Networking (nova-network)Core componentOptional componentMessage QueueIdentityImage ServiceComputeManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceDatabase ServiceData ProcessingService ComputeNodesKVM HypervisorComputeTelemetryAgentTelemetryAgent(s)Object StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceComputeNetworking diff --git a/doc/common/figures/instance-lifecycle.svg b/doc/common/figures/instance-lifecycle.svg deleted file mode 100644 index c48718e85f..0000000000 --- a/doc/common/figures/instance-lifecycle.svg +++ /dev/null @@ -1,13048 +0,0 @@ - - - -image/svg+xmlSchéma Réseau - Schéma Réseau - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VBackground-1 - - - Solid - - - - - - - - - - None - - - - - - - - - - - Sheet.88 - - - - - - - - -Initial State - -Sheet.2Sheet.3Sheet.4Sheet.5Sheet.6Sheet.7Sheet.8Sheet.9Sheet.10Sheet.11Sheet.12Sheet.13Sheet.14Sheet.15Compute Node - -Volume store - -Image store - - - - - - - - - Sheet.129 - - Sheet.130 - - - - - Sheet.131 - - - - - Sheet.132 - - - - Sheet.133 - - - - Sheet.134 - - - - Sheet.135 - - - - - - Sheet.136 - - Sheet.137 - - - - Sheet.138 - - - - Sheet.139 - - - - Sheet.140 - - - - Sheet.141 - - - - Sheet.142 - - - - Run Time State - - -Sheet.2Sheet.3Sheet.4Sheet.5Sheet.6Sheet.7Sheet.8Sheet.9Sheet.10Sheet.11Sheet.12Sheet.13Sheet.14Sheet.15Compute Node - - -Image store - - -Volume store - - -copy - - -iSCSI - - -Instance - - -vda - - -vdb - - -vdc - - -local disk - - - - - -local disk - -(glance) - -(cinder-volume) - -Volume store - - -Final State - - -Sheet.2Sheet.3Sheet.4Sheet.5Sheet.6Sheet.7Sheet.8Sheet.9Sheet.10Sheet.11Sheet.12Sheet.13Sheet.14Sheet.15Compute Node - - -Image store - - -local disk - -(glance) - -(cinder-volume) - -(glance) - -(cinder-volume) - - diff --git a/doc/common/figures/instances.png b/doc/common/figures/instances.png deleted file mode 100644 index e85446a702..0000000000 Binary files a/doc/common/figures/instances.png and /dev/null differ diff --git a/doc/common/figures/launch_instances.png b/doc/common/figures/launch_instances.png deleted file mode 100644 index f102af6da4..0000000000 Binary files a/doc/common/figures/launch_instances.png and /dev/null differ diff --git a/doc/common/figures/ml2_without_l2pop_full_mesh.png b/doc/common/figures/ml2_without_l2pop_full_mesh.png deleted file mode 100644 index d88920022b..0000000000 Binary files a/doc/common/figures/ml2_without_l2pop_full_mesh.png and /dev/null differ diff --git a/doc/common/figures/ml2_without_l2pop_partial_mesh.png b/doc/common/figures/ml2_without_l2pop_partial_mesh.png deleted file mode 100644 index ae6d747816..0000000000 Binary files a/doc/common/figures/ml2_without_l2pop_partial_mesh.png and /dev/null differ diff --git a/doc/common/figures/net-diagrams.pptx b/doc/common/figures/net-diagrams.pptx deleted file mode 100644 index c22cd54aa5..0000000000 Binary files a/doc/common/figures/net-diagrams.pptx and /dev/null differ diff --git a/doc/common/figures/nova-weighting-hosts.png b/doc/common/figures/nova-weighting-hosts.png deleted file mode 100644 index e0fe66acfe..0000000000 Binary files a/doc/common/figures/nova-weighting-hosts.png and /dev/null differ diff --git a/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png b/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png deleted file mode 100644 index 01afb35893..0000000000 Binary files a/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png and /dev/null differ diff --git a/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.svg b/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.svg deleted file mode 100644 index 5bf202d46f..0000000000 --- a/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.svg +++ /dev/null @@ -1,824 +0,0 @@ - - - - - Schéma Réseau - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VBackground-1 - - - Solid - - - - - - - - - - None - - - - - - - - - - - - - - Page-1 - - - - - - - - - Sheet.58 - - - - User.50 - - - - - - - - - - - - - - - - - - Add list item permissions - - - Sheet.3 - - Network.80 - - - - - - - - Sheet.2 - Nova-api - - - - Nova-api - - - Sheet.4 - - Network.80 - - - - - - - - Sheet.12 - Compute node - - - - Compute node - - - Sheet.13 - - - - Sheet.14 - The api sends a «get_vnc_console» message - - - - The api sends a «get_vnc_console» message - - Sheet.19 - - - Sheet.21 - - - - Sheet.18 - - Sheet.20 - Generates a token - - - - Generates a token - - Sheet.22 - - - - - Sheet.23 - - - - Sheet.24 - - - - - Sheet.25 - - - - Sheet.26 - - - - Sheet.27 - - - - - Sheet.34 - - Configure - - - - - - - - Sheet.33 - Libvirt driver - - - - Libvirt driver - - - Sheet.35 - - Configure - - - - - - - - Sheet.39 - Nova-consoleauth - - - - Nova-consoleauth - - - Sheet.41 - - - - Sheet.46 - - - - - Sheet.42 - - Sheet.44 - Sends «authorize_console » message - - - - Sends «authorize_console » message - - Sheet.55 - - Sheet.56 - - - - Document - - - - - - - - - - Sheet.5 - - - - Sheet.6 - - Sheet.49 - Caches the connection informations and token - - - - Caches the connection informations and token - - New - - - - - - - - - Sheet.47 - - - - Sheet.53 - Browses the url returned Http://novncip:port/?token=xyz - - - - Browses the url returnedHttp://novncip:port/?token=xyz - - Sheet.28 - - Sheet.29 - Sends a «get_vnc_connection» message - - - - Sends a «get_vnc_connection» message - - Sheet.30 - - Sheet.31 - - - - Document - - - - - - - - - - Sheet.51 - - - - - - - - - - - - Dialog form - - - - - - - - Sheet.96 - - - Sheet.97 - - - - Sheet.98 - - - Sheet.100 - - - - - - - - - - - Sheet.50 - Browser - - - - Browser - - Sheet.57 - noVNC - - - - noVNC - - - Sheet.70 - - Sheet.67 - Sends « check_token » message - - - - Sends « check_token » message - - - - - - - - - - - - - - - - Key - - Sheet.61 - - - - - Sheet.62 - - - - Sheet.63 - - - - - Sheet.64 - - - - Sheet.65 - - - - Sheet.66 - - - - - - Internet - - - - - - - - Sheet.72 - - - - Sheet.83 - - Sheet.74 - Proxy starts - - - - Proxy starts - - Power - - - - - - - - - Sheet.102 - - - - Sheet.106 - 2 - - - - 2 - - Sheet.107 - 3 - - - - 3 - - Sheet.108 - 4 - - - - 4 - - Sheet.105 - - Sheet.104 - Returns an url with a token - - - - Returns an url with a token - - Link.84 - - - - - - - - - Sheet.109 - - Sheet.43 - The user requests an access URL - - - - The user requests an access URL - - Internet.103 - - - - - - - - - Sheet.101 - 1 - - - - 1 - - Sheet.110 - 5 - - - - 5 - - Sheet.111 - 6 - - - - 6 - - Sheet.112 - 7 - - - - 7 - - Sheet.113 - 8 - - - - 8 - - diff --git a/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.vsd b/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.vsd deleted file mode 100644 index ad075eb326..0000000000 Binary files a/doc/common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.vsd and /dev/null differ diff --git a/doc/common/figures/objectstorage-accountscontainers.png b/doc/common/figures/objectstorage-accountscontainers.png deleted file mode 100644 index 4df7326a80..0000000000 Binary files a/doc/common/figures/objectstorage-accountscontainers.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-arch.png b/doc/common/figures/objectstorage-arch.png deleted file mode 100644 index 3b7978b673..0000000000 Binary files a/doc/common/figures/objectstorage-arch.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-buildingblocks.png b/doc/common/figures/objectstorage-buildingblocks.png deleted file mode 100644 index 8499ca1ead..0000000000 Binary files a/doc/common/figures/objectstorage-buildingblocks.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-nodes.png b/doc/common/figures/objectstorage-nodes.png deleted file mode 100644 index e7a0396f5f..0000000000 Binary files a/doc/common/figures/objectstorage-nodes.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-partitions.png b/doc/common/figures/objectstorage-partitions.png deleted file mode 100644 index 7e319ca0b7..0000000000 Binary files a/doc/common/figures/objectstorage-partitions.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-replication.png b/doc/common/figures/objectstorage-replication.png deleted file mode 100644 index 8ce1309131..0000000000 Binary files a/doc/common/figures/objectstorage-replication.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-ring.png b/doc/common/figures/objectstorage-ring.png deleted file mode 100644 index 22ef31201a..0000000000 Binary files a/doc/common/figures/objectstorage-ring.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-usecase.png b/doc/common/figures/objectstorage-usecase.png deleted file mode 100644 index 5d7c8f421e..0000000000 Binary files a/doc/common/figures/objectstorage-usecase.png and /dev/null differ diff --git a/doc/common/figures/objectstorage-zones.png b/doc/common/figures/objectstorage-zones.png deleted file mode 100644 index ee5ffbf72c..0000000000 Binary files a/doc/common/figures/objectstorage-zones.png and /dev/null differ diff --git a/doc/common/figures/objectstorage.png b/doc/common/figures/objectstorage.png deleted file mode 100644 index 9454065c28..0000000000 Binary files a/doc/common/figures/objectstorage.png and /dev/null differ diff --git a/doc/common/figures/openstack-arch-kilo-logical-v1.png b/doc/common/figures/openstack-arch-kilo-logical-v1.png deleted file mode 100644 index 7da9d5e1e2..0000000000 Binary files a/doc/common/figures/openstack-arch-kilo-logical-v1.png and /dev/null differ diff --git a/doc/common/figures/openstack-arch-kilo-logical-v1.svg b/doc/common/figures/openstack-arch-kilo-logical-v1.svg deleted file mode 100644 index 5ae21382ce..0000000000 --- a/doc/common/figures/openstack-arch-kilo-logical-v1.svg +++ /dev/null @@ -1,7246 +0,0 @@ - - - OpenStack logical architecture - - - - image/svg+xml - - OpenStack logical architecture - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - I - - nternet - - - - - - - - - - - - - - - - - - - - - - CLI clients(nova, cinder, neutron and so on) - Cloud management tools - GUI tools - - - - - - - - - Horizon - - - - - - - - OpenStack Dashboard - - - - - - - HTTP(S) - - - - - - - - Instance - - - - - - - - - Guest agent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cinder-api - - - - - - - - - - Queue - - - - - - - - - - - cinder-volume - - - - - - - - - - - Cinder database - - - - - - - - - - - - Volume provider - - - - - - - - - - - scheduler - - - - - - - - - - OpenStack Block Storage - - - - - - - - - glance-api - - - - - - - - - - - Glance database - - - - - - - - - - glance- registry - - - - - - - - - - - - - - - - - - - OpenStack - - - Image service - - - - - - - - - - - - - - - - - - neutron- server - - - - - - - - - - Queue - - - - - - - - - - - Neutron database - - - - - - - - - OpenStack Networking - - - - - - - - - - - - - - - - - - Queue - - - - - - - - - - - - Trove Database - - - - - - - - - - - - OpenStack Database Service - - - - - - - - - swift-account- server - - - - - - - - - - swift-object- server - - - - - - - - - - swift-container- server - - - - - - - - - - swift-proxy- server - - - - - - - - - - - Account databas e - - - - - - - - - - - Object database - - - - - - - - - - - Container database - - - - - - - - - - - - - trove- api - - - - - - - - - - trove- taskmanager - - - - - - - - - - trove- conductor - - - - - - - - - - - - - neutron- l3-agent * - - - - - - - - - - neutron- dhcp-agent - - - - - - - - - - - - Neutron L2 agent * - - - - - - - - - - - on plugin * - - - - - - - - - - Neutron 3rd party plugin - - - - - - - - - - - - - - - - - - - - - - - - - keystone-all - - - - - - - - - - - - - - - - - - - - - - LDAP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Queue - - - - - - - - - - - - Ironic Database - - - - - - - - - OpenStack - - - Bare Metal Service - - - - - - - - - ironic- api - - - - - - - - - - ironic- conductor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - drivers - - - - - - - - - Openstack Object Storage - - - - - - - - - - - - - - - - - - Queue - - - - - - - - OpenStack - - - Orchestration - - - - - - - - - heat-api - - - - - - - - - - heat-engine - - - - - - - - - - - heat- api-cfn - - - - - - - - - - - - - - - - - - - - - - OpenStack Identity Service - - - - - - - - - - - - - - - - - - - - - - - OpenStack Telemetry - - - - - - - - - ceilometer -api - - - - - - - - - - - Queue - - - - - - - - - - ceilometer- agent-central - - - - - - - - - - ceilometer- agent-compute - - - - - - - - - - - - - ceilometer-agent- notification - - - - - - - - - - - - ceilometer database - - - - - - - - - - ceilometer- collector - - - - - - - - - - - - - ceilometer-alarm- evaluator - - - - - - - - - - - ceilometer-alarm- notifier - - - - - - - - - - - - Log or HTTP callback - - - - - - - - - - - nova-api - - - - - - - - - - Queue - - - - - - - - - - nova-scheduler - - - - - - - - - - - Nova database - - - - - - - - - - - - - - - - - - - - - - - - - nova-console - - - - - - - - - - - - - - - - - - - - - - nova-cert - - - - - - - - - - - - nova-compute - - - - - - - - - - Hypervisor - - - - - - - - - - OpenStack - - - Compute - - - - - - - - - - - - - - - - OpenStack - - - Data Processing - - - - - - - - - sahara-all - - - - - - - - - - - sahara database - - - - - - - - - - Queue - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Optional, depends - glancestore - cinder- - nova-conductor - nova-consoleauth - database - optional - diff --git a/doc/common/figures/openstack_kilo_conceptual_arch.png b/doc/common/figures/openstack_kilo_conceptual_arch.png deleted file mode 100644 index c76efbbec0..0000000000 Binary files a/doc/common/figures/openstack_kilo_conceptual_arch.png and /dev/null differ diff --git a/doc/common/figures/openstack_kilo_conceptual_arch.svg b/doc/common/figures/openstack_kilo_conceptual_arch.svg deleted file mode 100644 index a717c35dde..0000000000 --- a/doc/common/figures/openstack_kilo_conceptual_arch.svg +++ /dev/null @@ -1,2158 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Trove - - - - - - - - - - Sahara - - - - - - - - - - Heat - - - - - - - - - - Nova - - - - - - - - - - Glance - - - - - - - - - - Ironic - - - - - - - - - - Neutron - - - - - - - - - - - - - - - - - - - - - - - - - - - - Provision - - - - - - - - - - Provides PXE network for - - - - - - - - - - Provides volumes to - - - - - - - - - - Orchestration - - - - - - - - - - Boots data processing instances via - - - - - - - - - - Assigns jobs to - - - - - - - - - - Provision, operation and management - - - - - - - - - - Boots database instances via - - - - - - - - - - Backups databases in - - - - - - - - - - Orchestrates clusters via - - - - - - - - - - Saves data or job binary in - - - - - - - - - - Provision - - - - - - - - - - Fetchs images via - - - - - - - - - - - - Stores images in - - - - - - - - - - Registers guest images in - - - - - - - - - - Provides network connection for - - - - - - - - - - Registers hadoop images in - - - - - - - - - - Swift - - - - - - - - - - VMs - - - - - - - - - - - Backups volumes in - - - - - - - - - - Cinder - - - - - - - - - - Keystone - - - - - - - - - - Ceilometer - - - - - - - - - - Horizon - - - - - - - - - - - Monitor - - - - - - - - - - Provides auth - - - - - - - - - - Provides UI - - - - - - - - - - - - - - - - - Provides images - - - - diff --git a/doc/common/figures/security_group_rules.png b/doc/common/figures/security_group_rules.png deleted file mode 100644 index 6085f844bd..0000000000 Binary files a/doc/common/figures/security_group_rules.png and /dev/null differ diff --git a/doc/common/figures/swift_install_arch.png b/doc/common/figures/swift_install_arch.png deleted file mode 100644 index 9f8b8b2ce5..0000000000 Binary files a/doc/common/figures/swift_install_arch.png and /dev/null differ diff --git a/doc/common/figures/swift_install_arch.svg b/doc/common/figures/swift_install_arch.svg deleted file mode 100644 index e43e3b6123..0000000000 --- a/doc/common/figures/swift_install_arch.svg +++ /dev/null @@ -1,15245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - David Pravec <alekibango@danix.org> - - - - - released under terms of Apache License - - - - - - - - - - - - - - - - - - - - - - - - - - OpenStack Object Storage Stores container databases, account databases, and stored objects - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Proxy node Public Switch - - - - - - - Storage nodes - - - - - - - - - - - - - - - - - - - - - - - Private Switch Auth node - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/common/figures/text6070-0.png b/doc/common/figures/text6070-0.png deleted file mode 100644 index 544b6d1f34..0000000000 Binary files a/doc/common/figures/text6070-0.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1-linuxbridge-compute.png b/doc/common/figures/under-the-hood-scenario-1-linuxbridge-compute.png deleted file mode 100644 index 0ec22d8831..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1-linuxbridge-compute.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1-linuxbridge-netns.png b/doc/common/figures/under-the-hood-scenario-1-linuxbridge-netns.png deleted file mode 100644 index cc4b329eb6..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1-linuxbridge-netns.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1-linuxbridge-network.png b/doc/common/figures/under-the-hood-scenario-1-linuxbridge-network.png deleted file mode 100644 index 1ba17b87d5..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1-linuxbridge-network.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1-ovs-compute.png b/doc/common/figures/under-the-hood-scenario-1-ovs-compute.png deleted file mode 100644 index f3f0972438..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1-ovs-compute.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1-ovs-netns.png b/doc/common/figures/under-the-hood-scenario-1-ovs-netns.png deleted file mode 100644 index 250ef5bde1..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1-ovs-netns.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1-ovs-network.png b/doc/common/figures/under-the-hood-scenario-1-ovs-network.png deleted file mode 100644 index 3c21c84e7c..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1-ovs-network.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-1.png b/doc/common/figures/under-the-hood-scenario-1.png deleted file mode 100644 index 0e82aa6a72..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-1.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2-linuxbridge-compute.png b/doc/common/figures/under-the-hood-scenario-2-linuxbridge-compute.png deleted file mode 100644 index d12931e406..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2-linuxbridge-compute.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2-linuxbridge-netns.png b/doc/common/figures/under-the-hood-scenario-2-linuxbridge-netns.png deleted file mode 100644 index 87b9a8427c..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2-linuxbridge-netns.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2-linuxbridge-network.png b/doc/common/figures/under-the-hood-scenario-2-linuxbridge-network.png deleted file mode 100644 index a4abe072c0..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2-linuxbridge-network.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2-ovs-compute.png b/doc/common/figures/under-the-hood-scenario-2-ovs-compute.png deleted file mode 100644 index 83bb4c60e5..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2-ovs-compute.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2-ovs-netns.png b/doc/common/figures/under-the-hood-scenario-2-ovs-netns.png deleted file mode 100644 index 50752c7e8b..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2-ovs-netns.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2-ovs-network.png b/doc/common/figures/under-the-hood-scenario-2-ovs-network.png deleted file mode 100644 index 78ed02ec1c..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2-ovs-network.png and /dev/null differ diff --git a/doc/common/figures/under-the-hood-scenario-2.png b/doc/common/figures/under-the-hood-scenario-2.png deleted file mode 100644 index 2a7ed8ee47..0000000000 Binary files a/doc/common/figures/under-the-hood-scenario-2.png and /dev/null differ diff --git a/doc/common/figures/xenapinfs/local_config.png b/doc/common/figures/xenapinfs/local_config.png deleted file mode 100644 index 3db40f0562..0000000000 Binary files a/doc/common/figures/xenapinfs/local_config.png and /dev/null differ diff --git a/doc/common/figures/xenapinfs/remote_config.png b/doc/common/figures/xenapinfs/remote_config.png deleted file mode 100644 index a1d4313c3a..0000000000 Binary files a/doc/common/figures/xenapinfs/remote_config.png and /dev/null differ diff --git a/doc/common/figures/xenapinfs/xenapinfs.svg b/doc/common/figures/xenapinfs/xenapinfs.svg deleted file mode 100644 index 095e5c323c..0000000000 --- a/doc/common/figures/xenapinfs/xenapinfs.svg +++ /dev/null @@ -1,480 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - CinderwithXenAPINFS - - XS/XCPStorageController - NFS share - - - - - - - - XS/XCPComputenodes - remote_config - - XS/XCPStorageController - NFS share - - - - - - - - XS/XCPComputenodes - local_config - - CinderwithXenAPINFS - - diff --git a/doc/common/samples/authentication.json b/doc/common/samples/authentication.json deleted file mode 100644 index 933c2870a3..0000000000 --- a/doc/common/samples/authentication.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "context_is_admin": [ - [ - "role:admin" - ] - ], - "admin_or_owner": [ - [ - "is_admin:True" - ], - [ - "project_id:%(project_id)s" - ] - ], - "default": [ - [ - "rule:admin_or_owner" - ] - ], - "admin_api": [ - [ - "is_admin:True" - ] - ], - "volume:create": [], - "volume:get_all": [], - "volume:get_volume_metadata": [], - "volume:get_snapshot": [], - "volume:get_all_snapshots": [], - "volume_extension:types_manage": [ - [ - "rule:admin_api" - ] - ], - "volume_extension:types_extra_specs": [ - [ - "rule:admin_api" - ] - ], - "...": [ - [ - "...:..." - ] - ] -} diff --git a/doc/common/samples/cinder.conf b/doc/common/samples/cinder.conf deleted file mode 100644 index 57072eb57b..0000000000 --- a/doc/common/samples/cinder.conf +++ /dev/null @@ -1,18 +0,0 @@ -[DEFAULT] -rootwrap_config=/etc/cinder/rootwrap.conf -sql_connection = mysql+pymysql://cinder:openstack@192.168.127.130/cinder -api_paste_config = /etc/cinder/api-paste.ini - -iscsi_helper=tgtadm -volume_name_template = volume-%s -volume_group = cinder-volumes -verbose = True -auth_strategy = keystone -#osapi_volume_listen_port=5900 - -# Add these when not using the defaults. -rabbit_host = 10.10.10.10 -rabbit_port = 5672 -rabbit_userid = rabbit -rabbit_password = secure_password -rabbit_virtual_host = /nova \ No newline at end of file diff --git a/doc/common/samples/dashboard-keystone_policy.json b/doc/common/samples/dashboard-keystone_policy.json deleted file mode 100644 index 9c445c60dc..0000000000 --- a/doc/common/samples/dashboard-keystone_policy.json +++ /dev/null @@ -1,381 +0,0 @@ -{ - "admin_required": [ - [ - "role:admin" - ], - [ - "is_admin:1" - ] - ], - "service_role": [ - [ - "role:service" - ] - ], - "service_or_admin": [ - [ - "rule:admin_required" - ], - [ - "rule:service_role" - ] - ], - "owner": [ - [ - "user_id:%(user_id)s" - ] - ], - "admin_or_owner": [ - [ - "rule:admin_required" - ], - [ - "rule:owner" - ] - ], - "default": [ - [ - "rule:admin_required" - ] - ], - "identity:get_service": [ - [ - "rule:admin_required" - ] - ], - "identity:list_services": [ - [ - "rule:admin_required" - ] - ], - "identity:create_service": [ - [ - "rule:admin_required" - ] - ], - "identity:update_service": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_service": [ - [ - "rule:admin_required" - ] - ], - "identity:get_endpoint": [ - [ - "rule:admin_required" - ] - ], - "identity:list_endpoints": [ - [ - "rule:admin_required" - ] - ], - "identity:create_endpoint": [ - [ - "rule:admin_required" - ] - ], - "identity:update_endpoint": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_endpoint": [ - [ - "rule:admin_required" - ] - ], - "identity:get_domain": [ - [ - "rule:admin_required" - ] - ], - "identity:list_domains": [ - [ - "rule:admin_required" - ] - ], - "identity:create_domain": [ - [ - "rule:admin_required" - ] - ], - "identity:update_domain": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_domain": [ - [ - "rule:admin_required" - ] - ], - "identity:get_project": [ - [ - "rule:admin_required" - ] - ], - "identity:list_projects": [ - [ - "rule:admin_required" - ] - ], - "identity:list_user_projects": [ - [ - "rule:admin_or_owner" - ] - ], - "identity:create_project": [ - [ - "rule:admin_required" - ] - ], - "identity:update_project": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_project": [ - [ - "rule:admin_required" - ] - ], - "identity:get_user": [ - [ - "rule:admin_required" - ] - ], - "identity:list_users": [ - [ - "rule:admin_required" - ] - ], - "identity:create_user": [ - [ - "rule:admin_required" - ] - ], - "identity:update_user": [ - [ - "rule:admin_or_owner" - ] - ], - "identity:delete_user": [ - [ - "rule:admin_required" - ] - ], - "identity:get_group": [ - [ - "rule:admin_required" - ] - ], - "identity:list_groups": [ - [ - "rule:admin_required" - ] - ], - "identity:list_groups_for_user": [ - [ - "rule:admin_or_owner" - ] - ], - "identity:create_group": [ - [ - "rule:admin_required" - ] - ], - "identity:update_group": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_group": [ - [ - "rule:admin_required" - ] - ], - "identity:list_users_in_group": [ - [ - "rule:admin_required" - ] - ], - "identity:remove_user_from_group": [ - [ - "rule:admin_required" - ] - ], - "identity:check_user_in_group": [ - [ - "rule:admin_required" - ] - ], - "identity:add_user_to_group": [ - [ - "rule:admin_required" - ] - ], - "identity:get_credential": [ - [ - "rule:admin_required" - ] - ], - "identity:list_credentials": [ - [ - "rule:admin_required" - ] - ], - "identity:create_credential": [ - [ - "rule:admin_required" - ] - ], - "identity:update_credential": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_credential": [ - [ - "rule:admin_required" - ] - ], - "identity:get_role": [ - [ - "rule:admin_required" - ] - ], - "identity:list_roles": [ - [ - "rule:admin_required" - ] - ], - "identity:create_role": [ - [ - "rule:admin_required" - ] - ], - "identity:update_role": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_role": [ - [ - "rule:admin_required" - ] - ], - "identity:check_grant": [ - [ - "rule:admin_required" - ] - ], - "identity:list_grants": [ - [ - "rule:admin_required" - ] - ], - "identity:create_grant": [ - [ - "rule:admin_required" - ] - ], - "identity:revoke_grant": [ - [ - "rule:admin_required" - ] - ], - "identity:list_role_assignments": [ - [ - "rule:admin_required" - ] - ], - "identity:get_policy": [ - [ - "rule:admin_required" - ] - ], - "identity:list_policies": [ - [ - "rule:admin_required" - ] - ], - "identity:create_policy": [ - [ - "rule:admin_required" - ] - ], - "identity:update_policy": [ - [ - "rule:admin_required" - ] - ], - "identity:delete_policy": [ - [ - "rule:admin_required" - ] - ], - "identity:check_token": [ - [ - "rule:admin_required" - ] - ], - "identity:validate_token": [ - [ - "rule:service_or_admin" - ] - ], - "identity:validate_token_head": [ - [ - "rule:service_or_admin" - ] - ], - "identity:revocation_list": [ - [ - "rule:service_or_admin" - ] - ], - "identity:revoke_token": [ - [ - "rule:admin_or_owner" - ] - ], - "identity:create_trust": [ - [ - "user_id:%(trust.trustor_user_id)s" - ] - ], - "identity:get_trust": [ - [ - "rule:admin_or_owner" - ] - ], - "identity:list_trusts": [ - [ - "@" - ] - ], - "identity:list_roles_for_trust": [ - [ - "@" - ] - ], - "identity:check_role_for_trust": [ - [ - "@" - ] - ], - "identity:get_role_for_trust": [ - [ - "@" - ] - ], - "identity:delete_trust": [ - [ - "@" - ] - ] -} \ No newline at end of file diff --git a/doc/common/samples/dashboard-nova_policy.json b/doc/common/samples/dashboard-nova_policy.json deleted file mode 100644 index 6e5027efb5..0000000000 --- a/doc/common/samples/dashboard-nova_policy.json +++ /dev/null @@ -1,489 +0,0 @@ -{ - "context_is_admin": "role:admin", - "admin_or_owner": "is_admin:True or project_id:%(project_id)s", - "default": "rule:admin_or_owner", - - "cells_scheduler_filter:TargetCellFilter": "is_admin:True", - - "compute:create": "", - "compute:create:attach_network": "", - "compute:create:attach_volume": "", - "compute:create:forced_host": "is_admin:True", - - "compute:get": "", - "compute:get_all": "", - "compute:get_all_tenants": "is_admin:True", - - "compute:update": "", - - "compute:get_instance_metadata": "", - "compute:get_all_instance_metadata": "", - "compute:get_all_instance_system_metadata": "", - "compute:update_instance_metadata": "", - "compute:delete_instance_metadata": "", - - "compute:get_instance_faults": "", - "compute:get_diagnostics": "", - "compute:get_instance_diagnostics": "", - - "compute:start": "rule:admin_or_owner", - "compute:stop": "rule:admin_or_owner", - - "compute:get_lock": "", - "compute:lock": "", - "compute:unlock": "", - "compute:unlock_override": "rule:admin_api", - - "compute:get_vnc_console": "", - "compute:get_spice_console": "", - "compute:get_rdp_console": "", - "compute:get_serial_console": "", - "compute:get_mks_console": "", - "compute:get_console_output": "", - - "compute:reset_network": "", - "compute:inject_network_info": "", - "compute:add_fixed_ip": "", - "compute:remove_fixed_ip": "", - - "compute:attach_volume": "", - "compute:detach_volume": "", - "compute:swap_volume": "", - - "compute:attach_interface": "", - "compute:detach_interface": "", - - "compute:set_admin_password": "", - - "compute:rescue": "", - "compute:unrescue": "", - - "compute:suspend": "", - "compute:resume": "", - - "compute:pause": "", - "compute:unpause": "", - - "compute:shelve": "", - "compute:shelve_offload": "", - "compute:unshelve": "", - - "compute:snapshot": "", - "compute:snapshot_volume_backed": "", - "compute:backup": "", - - "compute:resize": "", - "compute:confirm_resize": "", - "compute:revert_resize": "", - - "compute:rebuild": "", - "compute:reboot": "", - "compute:delete": "rule:admin_or_owner", - "compute:soft_delete": "rule:admin_or_owner", - "compute:force_delete": "rule:admin_or_owner", - - "compute:security_groups:add_to_instance": "", - "compute:security_groups:remove_from_instance": "", - - "compute:delete": "", - "compute:soft_delete": "", - "compute:force_delete": "", - "compute:restore": "", - - "compute:volume_snapshot_create": "", - "compute:volume_snapshot_delete": "", - - "admin_api": "is_admin:True", - "compute_extension:accounts": "rule:admin_api", - "compute_extension:admin_actions": "rule:admin_api", - "compute_extension:admin_actions:pause": "rule:admin_or_owner", - "compute_extension:admin_actions:unpause": "rule:admin_or_owner", - "compute_extension:admin_actions:suspend": "rule:admin_or_owner", - "compute_extension:admin_actions:resume": "rule:admin_or_owner", - "compute_extension:admin_actions:lock": "rule:admin_or_owner", - "compute_extension:admin_actions:unlock": "rule:admin_or_owner", - "compute_extension:admin_actions:resetNetwork": "rule:admin_api", - "compute_extension:admin_actions:injectNetworkInfo": "rule:admin_api", - "compute_extension:admin_actions:createBackup": "rule:admin_or_owner", - "compute_extension:admin_actions:migrateLive": "rule:admin_api", - "compute_extension:admin_actions:resetState": "rule:admin_api", - "compute_extension:admin_actions:migrate": "rule:admin_api", - "compute_extension:aggregates": "rule:admin_api", - "compute_extension:agents": "rule:admin_api", - "compute_extension:attach_interfaces": "", - "compute_extension:baremetal_nodes": "rule:admin_api", - "compute_extension:cells": "rule:admin_api", - "compute_extension:cells:create": "rule:admin_api", - "compute_extension:cells:delete": "rule:admin_api", - "compute_extension:cells:update": "rule:admin_api", - "compute_extension:cells:sync_instances": "rule:admin_api", - "compute_extension:certificates": "", - "compute_extension:cloudpipe": "rule:admin_api", - "compute_extension:cloudpipe_update": "rule:admin_api", - "compute_extension:config_drive": "", - "compute_extension:console_output": "", - "compute_extension:consoles": "", - "compute_extension:createserverext": "", - "compute_extension:deferred_delete": "", - "compute_extension:disk_config": "", - "compute_extension:evacuate": "rule:admin_api", - "compute_extension:extended_server_attributes": "rule:admin_api", - "compute_extension:extended_status": "", - "compute_extension:extended_availability_zone": "", - "compute_extension:extended_ips": "", - "compute_extension:extended_ips_mac": "", - "compute_extension:extended_vif_net": "", - "compute_extension:extended_volumes": "", - "compute_extension:fixed_ips": "rule:admin_api", - "compute_extension:flavor_access": "", - "compute_extension:flavor_access:addTenantAccess": "rule:admin_api", - "compute_extension:flavor_access:removeTenantAccess": "rule:admin_api", - "compute_extension:flavor_disabled": "", - "compute_extension:flavor_rxtx": "", - "compute_extension:flavor_swap": "", - "compute_extension:flavorextradata": "", - "compute_extension:flavorextraspecs:index": "", - "compute_extension:flavorextraspecs:show": "", - "compute_extension:flavorextraspecs:create": "rule:admin_api", - "compute_extension:flavorextraspecs:update": "rule:admin_api", - "compute_extension:flavorextraspecs:delete": "rule:admin_api", - "compute_extension:flavormanage": "rule:admin_api", - "compute_extension:floating_ip_dns": "", - "compute_extension:floating_ip_pools": "", - "compute_extension:floating_ips": "", - "compute_extension:floating_ips_bulk": "rule:admin_api", - "compute_extension:fping": "", - "compute_extension:fping:all_tenants": "rule:admin_api", - "compute_extension:hide_server_addresses": "is_admin:False", - "compute_extension:hosts": "rule:admin_api", - "compute_extension:hypervisors": "rule:admin_api", - "compute_extension:image_size": "", - "compute_extension:instance_actions": "", - "compute_extension:instance_actions:events": "rule:admin_api", - "compute_extension:instance_usage_audit_log": "rule:admin_api", - "compute_extension:keypairs": "", - "compute_extension:keypairs:index": "", - "compute_extension:keypairs:show": "", - "compute_extension:keypairs:create": "", - "compute_extension:keypairs:delete": "", - "compute_extension:multinic": "", - "compute_extension:networks": "rule:admin_api", - "compute_extension:networks:view": "", - "compute_extension:networks_associate": "rule:admin_api", - "compute_extension:os-tenant-networks": "", - "compute_extension:quotas:show": "", - "compute_extension:quotas:update": "rule:admin_api", - "compute_extension:quotas:delete": "rule:admin_api", - "compute_extension:quota_classes": "", - "compute_extension:rescue": "", - "compute_extension:security_group_default_rules": "rule:admin_api", - "compute_extension:security_groups": "", - "compute_extension:server_diagnostics": "rule:admin_api", - "compute_extension:server_groups": "", - "compute_extension:server_password": "", - "compute_extension:server_usage": "", - "compute_extension:services": "rule:admin_api", - "compute_extension:shelve": "", - "compute_extension:shelveOffload": "rule:admin_api", - "compute_extension:simple_tenant_usage:show": "rule:admin_or_owner", - "compute_extension:simple_tenant_usage:list": "rule:admin_api", - "compute_extension:unshelve": "", - "compute_extension:users": "rule:admin_api", - "compute_extension:virtual_interfaces": "", - "compute_extension:virtual_storage_arrays": "", - "compute_extension:volumes": "", - "compute_extension:volume_attachments:index": "", - "compute_extension:volume_attachments:show": "", - "compute_extension:volume_attachments:create": "", - "compute_extension:volume_attachments:update": "", - "compute_extension:volume_attachments:delete": "", - "compute_extension:volumetypes": "", - "compute_extension:availability_zone:list": "", - "compute_extension:availability_zone:detail": "rule:admin_api", - "compute_extension:used_limits_for_admin": "rule:admin_api", - "compute_extension:migrations:index": "rule:admin_api", - "compute_extension:os-assisted-volume-snapshots:create": "rule:admin_api", - "compute_extension:os-assisted-volume-snapshots:delete": "rule:admin_api", - "compute_extension:console_auth_tokens": "rule:admin_api", - "compute_extension:os-server-external-events:create": "rule:admin_api", - - "network:get_all": "", - "network:get": "", - "network:create": "", - "network:delete": "", - "network:associate": "", - "network:disassociate": "", - "network:get_vifs_by_instance": "", - "network:allocate_for_instance": "", - "network:deallocate_for_instance": "", - "network:validate_networks": "", - "network:get_instance_uuids_by_ip_filter": "", - "network:get_instance_id_by_floating_address": "", - "network:setup_networks_on_host": "", - "network:get_backdoor_port": "", - - "network:get_floating_ip": "", - "network:get_floating_ip_pools": "", - "network:get_floating_ip_by_address": "", - "network:get_floating_ips_by_project": "", - "network:get_floating_ips_by_fixed_address": "", - "network:allocate_floating_ip": "", - "network:associate_floating_ip": "", - "network:disassociate_floating_ip": "", - "network:release_floating_ip": "", - "network:migrate_instance_start": "", - "network:migrate_instance_finish": "", - - "network:get_fixed_ip": "", - "network:get_fixed_ip_by_address": "", - "network:add_fixed_ip_to_instance": "", - "network:remove_fixed_ip_from_instance": "", - "network:add_network_to_project": "", - "network:get_instance_nw_info": "", - - "network:get_dns_domains": "", - "network:add_dns_entry": "", - "network:modify_dns_entry": "", - "network:delete_dns_entry": "", - "network:get_dns_entries_by_address": "", - "network:get_dns_entries_by_name": "", - "network:create_private_dns_domain": "", - "network:create_public_dns_domain": "", - "network:delete_dns_domain": "", - "network:attach_external_network": "rule:admin_api", - "network:get_vif_by_mac_address": "", - - "os_compute_api:servers:detail:get_all_tenants": "is_admin:True", - "os_compute_api:servers:index:get_all_tenants": "is_admin:True", - "os_compute_api:servers:confirm_resize": "", - "os_compute_api:servers:create": "", - "os_compute_api:servers:create:attach_network": "", - "os_compute_api:servers:create:attach_volume": "", - "os_compute_api:servers:create:forced_host": "rule:admin_api", - "os_compute_api:servers:delete": "", - "os_compute_api:servers:update": "", - "os_compute_api:servers:detail": "", - "os_compute_api:servers:index": "", - "os_compute_api:servers:reboot": "", - "os_compute_api:servers:rebuild": "", - "os_compute_api:servers:resize": "", - "os_compute_api:servers:revert_resize": "", - "os_compute_api:servers:show": "", - "os_compute_api:servers:create_image": "", - "os_compute_api:servers:create_image:allow_volume_backed": "", - "os_compute_api:servers:start": "rule:admin_or_owner", - "os_compute_api:servers:stop": "rule:admin_or_owner", - "os_compute_api:os-access-ips:discoverable": "", - "os_compute_api:os-access-ips": "", - "os_compute_api:os-admin-actions": "rule:admin_api", - "os_compute_api:os-admin-actions:discoverable": "", - "os_compute_api:os-admin-actions:reset_network": "rule:admin_api", - "os_compute_api:os-admin-actions:inject_network_info": "rule:admin_api", - "os_compute_api:os-admin-actions:reset_state": "rule:admin_api", - "os_compute_api:os-admin-password": "", - "os_compute_api:os-admin-password:discoverable": "", - "os_compute_api:os-aggregates:discoverable": "", - "os_compute_api:os-aggregates:index": "rule:admin_api", - "os_compute_api:os-aggregates:create": "rule:admin_api", - "os_compute_api:os-aggregates:show": "rule:admin_api", - "os_compute_api:os-aggregates:update": "rule:admin_api", - "os_compute_api:os-aggregates:delete": "rule:admin_api", - "os_compute_api:os-aggregates:add_host": "rule:admin_api", - "os_compute_api:os-aggregates:remove_host": "rule:admin_api", - "os_compute_api:os-aggregates:set_metadata": "rule:admin_api", - "os_compute_api:os-agents": "rule:admin_api", - "os_compute_api:os-agents:discoverable": "", - "os_compute_api:os-attach-interfaces": "", - "os_compute_api:os-attach-interfaces:discoverable": "", - "os_compute_api:os-baremetal-nodes": "rule:admin_api", - "os_compute_api:os-baremetal-nodes:discoverable": "", - "os_compute_api:os-block-device-mapping-v1:discoverable": "", - "os_compute_api:os-cells": "rule:admin_api", - "os_compute_api:os-cells:create": "rule:admin_api", - "os_compute_api:os-cells:delete": "rule:admin_api", - "os_compute_api:os-cells:update": "rule:admin_api", - "os_compute_api:os-cells:sync_instances": "rule:admin_api", - "os_compute_api:os-cells:discoverable": "", - "os_compute_api:os-certificates:create": "", - "os_compute_api:os-certificates:show": "", - "os_compute_api:os-certificates:discoverable": "", - "os_compute_api:os-cloudpipe": "rule:admin_api", - "os_compute_api:os-cloudpipe:discoverable": "", - "os_compute_api:os-config-drive": "", - "os_compute_api:os-consoles:discoverable": "", - "os_compute_api:os-consoles:create": "", - "os_compute_api:os-consoles:delete": "", - "os_compute_api:os-consoles:index": "", - "os_compute_api:os-consoles:show": "", - "os_compute_api:os-console-output:discoverable": "", - "os_compute_api:os-console-output": "", - "os_compute_api:os-remote-consoles": "", - "os_compute_api:os-remote-consoles:discoverable": "", - "os_compute_api:os-create-backup:discoverable": "", - "os_compute_api:os-create-backup": "rule:admin_or_owner", - "os_compute_api:os-deferred-delete": "", - "os_compute_api:os-deferred-delete:discoverable": "", - "os_compute_api:os-disk-config": "", - "os_compute_api:os-disk-config:discoverable": "", - "os_compute_api:os-evacuate": "rule:admin_api", - "os_compute_api:os-evacuate:discoverable": "", - "os_compute_api:os-extended-server-attributes": "rule:admin_api", - "os_compute_api:os-extended-server-attributes:discoverable": "", - "os_compute_api:os-extended-status": "", - "os_compute_api:os-extended-status:discoverable": "", - "os_compute_api:os-extended-availability-zone": "", - "os_compute_api:os-extended-availability-zone:discoverable": "", - "os_compute_api:extensions": "", - "os_compute_api:extension_info:discoverable": "", - "os_compute_api:os-extended-volumes": "", - "os_compute_api:os-extended-volumes:discoverable": "", - "os_compute_api:os-fixed-ips": "rule:admin_api", - "os_compute_api:os-fixed-ips:discoverable": "", - "os_compute_api:os-flavor-access": "", - "os_compute_api:os-flavor-access:discoverable": "", - "os_compute_api:os-flavor-access:remove_tenant_access": "rule:admin_api", - "os_compute_api:os-flavor-access:add_tenant_access": "rule:admin_api", - "os_compute_api:os-flavor-rxtx": "", - "os_compute_api:os-flavor-rxtx:discoverable": "", - "os_compute_api:flavors:discoverable": "", - "os_compute_api:os-flavor-extra-specs:discoverable": "", - "os_compute_api:os-flavor-extra-specs:index": "", - "os_compute_api:os-flavor-extra-specs:show": "", - "os_compute_api:os-flavor-extra-specs:create": "rule:admin_api", - "os_compute_api:os-flavor-extra-specs:update": "rule:admin_api", - "os_compute_api:os-flavor-extra-specs:delete": "rule:admin_api", - "os_compute_api:os-flavor-manage:discoverable": "", - "os_compute_api:os-flavor-manage": "rule:admin_api", - "os_compute_api:os-floating-ip-dns": "", - "os_compute_api:os-floating-ip-dns:discoverable": "", - "os_compute_api:os-floating-ip-dns:domain:update": "rule:admin_api", - "os_compute_api:os-floating-ip-dns:domain:delete": "rule:admin_api", - "os_compute_api:os-floating-ip-pools": "", - "os_compute_api:os-floating-ip-pools:discoverable": "", - "os_compute_api:os-floating-ips": "", - "os_compute_api:os-floating-ips:discoverable": "", - "os_compute_api:os-floating-ips-bulk": "rule:admin_api", - "os_compute_api:os-floating-ips-bulk:discoverable": "", - "os_compute_api:os-fping": "", - "os_compute_api:os-fping:discoverable": "", - "os_compute_api:os-fping:all_tenants": "rule:admin_api", - "os_compute_api:os-hide-server-addresses": "is_admin:False", - "os_compute_api:os-hide-server-addresses:discoverable": "", - "os_compute_api:os-hosts": "rule:admin_api", - "os_compute_api:os-hosts:discoverable": "", - "os_compute_api:os-hypervisors": "rule:admin_api", - "os_compute_api:os-hypervisors:discoverable": "", - "os_compute_api:images:discoverable": "", - "os_compute_api:image-size": "", - "os_compute_api:image-size:discoverable": "", - "os_compute_api:os-instance-actions": "", - "os_compute_api:os-instance-actions:discoverable": "", - "os_compute_api:os-instance-actions:events": "rule:admin_api", - "os_compute_api:os-instance-usage-audit-log": "rule:admin_api", - "os_compute_api:os-instance-usage-audit-log:discoverable": "", - "os_compute_api:ips:discoverable": "", - "os_compute_api:ips:index": "rule:admin_or_owner", - "os_compute_api:ips:show": "rule:admin_or_owner", - "os_compute_api:os-keypairs:discoverable": "", - "os_compute_api:os-keypairs": "", - "os_compute_api:os-keypairs:index": "rule:admin_api or user_id:%(user_id)s", - "os_compute_api:os-keypairs:show": "rule:admin_api or user_id:%(user_id)s", - "os_compute_api:os-keypairs:create": "rule:admin_api or user_id:%(user_id)s", - "os_compute_api:os-keypairs:delete": "rule:admin_api or user_id:%(user_id)s", - "os_compute_api:limits:discoverable": "", - "os_compute_api:limits": "", - "os_compute_api:os-lock-server:discoverable": "", - "os_compute_api:os-lock-server:lock": "rule:admin_or_owner", - "os_compute_api:os-lock-server:unlock": "rule:admin_or_owner", - "os_compute_api:os-lock-server:unlock:unlock_override": "rule:admin_api", - "os_compute_api:os-migrate-server:discoverable": "", - "os_compute_api:os-migrate-server:migrate": "rule:admin_api", - "os_compute_api:os-migrate-server:migrate_live": "rule:admin_api", - "os_compute_api:os-multinic": "", - "os_compute_api:os-multinic:discoverable": "", - "os_compute_api:os-networks": "rule:admin_api", - "os_compute_api:os-networks:view": "", - "os_compute_api:os-networks:discoverable": "", - "os_compute_api:os-networks-associate": "rule:admin_api", - "os_compute_api:os-networks-associate:discoverable": "", - "os_compute_api:os-pause-server:discoverable": "", - "os_compute_api:os-pause-server:pause": "rule:admin_or_owner", - "os_compute_api:os-pause-server:unpause": "rule:admin_or_owner", - "os_compute_api:os-pci:pci_servers": "", - "os_compute_api:os-pci:discoverable": "", - "os_compute_api:os-pci:index": "rule:admin_api", - "os_compute_api:os-pci:detail": "rule:admin_api", - "os_compute_api:os-pci:show": "rule:admin_api", - "os_compute_api:os-personality:discoverable": "", - "os_compute_api:os-preserve-ephemeral-rebuild:discoverable": "", - "os_compute_api:os-quota-sets:discoverable": "", - "os_compute_api:os-quota-sets:show": "rule:admin_or_owner", - "os_compute_api:os-quota-sets:defaults": "", - "os_compute_api:os-quota-sets:update": "rule:admin_api", - "os_compute_api:os-quota-sets:delete": "rule:admin_api", - "os_compute_api:os-quota-sets:detail": "rule:admin_api", - "os_compute_api:os-quota-class-sets:update": "rule:admin_api", - "os_compute_api:os-quota-class-sets:show": "is_admin:True or quota_class:%(quota_class)s", - "os_compute_api:os-quota-class-sets:discoverable": "", - "os_compute_api:os-rescue": "", - "os_compute_api:os-rescue:discoverable": "", - "os_compute_api:os-scheduler-hints:discoverable": "", - "os_compute_api:os-security-group-default-rules:discoverable": "", - "os_compute_api:os-security-group-default-rules": "rule:admin_api", - "os_compute_api:os-security-groups": "", - "os_compute_api:os-security-groups:discoverable": "", - "os_compute_api:os-server-diagnostics": "rule:admin_api", - "os_compute_api:os-server-diagnostics:discoverable": "", - "os_compute_api:os-server-password": "", - "os_compute_api:os-server-password:discoverable": "", - "os_compute_api:os-server-usage": "", - "os_compute_api:os-server-usage:discoverable": "", - "os_compute_api:os-server-groups": "", - "os_compute_api:os-server-groups:discoverable": "", - "os_compute_api:os-services": "rule:admin_api", - "os_compute_api:os-services:discoverable": "", - "os_compute_api:server-metadata:discoverable": "", - "os_compute_api:server-metadata:index": "rule:admin_or_owner", - "os_compute_api:server-metadata:show": "rule:admin_or_owner", - "os_compute_api:server-metadata:delete": "rule:admin_or_owner", - "os_compute_api:server-metadata:create": "rule:admin_or_owner", - "os_compute_api:server-metadata:update": "rule:admin_or_owner", - "os_compute_api:server-metadata:update_all": "rule:admin_or_owner", - "os_compute_api:servers:discoverable": "", - "os_compute_api:os-shelve:shelve": "", - "os_compute_api:os-shelve:shelve:discoverable": "", - "os_compute_api:os-shelve:shelve_offload": "rule:admin_api", - "os_compute_api:os-simple-tenant-usage:discoverable": "", - "os_compute_api:os-simple-tenant-usage:show": "rule:admin_or_owner", - "os_compute_api:os-simple-tenant-usage:list": "rule:admin_api", - "os_compute_api:os-suspend-server:discoverable": "", - "os_compute_api:os-suspend-server:suspend": "rule:admin_or_owner", - "os_compute_api:os-suspend-server:resume": "rule:admin_or_owner", - "os_compute_api:os-tenant-networks": "rule:admin_or_owner", - "os_compute_api:os-tenant-networks:discoverable": "", - "os_compute_api:os-shelve:unshelve": "", - "os_compute_api:os-user-data:discoverable": "", - "os_compute_api:os-virtual-interfaces": "", - "os_compute_api:os-virtual-interfaces:discoverable": "", - "os_compute_api:os-volumes": "", - "os_compute_api:os-volumes:discoverable": "", - "os_compute_api:os-volumes-attachments:index": "", - "os_compute_api:os-volumes-attachments:show": "", - "os_compute_api:os-volumes-attachments:create": "", - "os_compute_api:os-volumes-attachments:update": "", - "os_compute_api:os-volumes-attachments:delete": "", - "os_compute_api:os-volumes-attachments:discoverable": "", - "os_compute_api:os-availability-zone:list": "", - "os_compute_api:os-availability-zone:discoverable": "", - "os_compute_api:os-availability-zone:detail": "rule:admin_api", - "os_compute_api:os-used-limits": "rule:admin_api", - "os_compute_api:os-used-limits:discoverable": "", - "os_compute_api:os-migrations:index": "rule:admin_api", - "os_compute_api:os-migrations:discoverable": "", - "os_compute_api:os-assisted-volume-snapshots:create": "rule:admin_api", - "os_compute_api:os-assisted-volume-snapshots:delete": "rule:admin_api", - "os_compute_api:os-assisted-volume-snapshots:discoverable": "", - "os_compute_api:os-console-auth-tokens": "rule:admin_api", - "os_compute_api:os-server-external-events:create": "rule:admin_api" -} - diff --git a/doc/common/samples/keystone.conf b/doc/common/samples/keystone.conf deleted file mode 100644 index 2e0c0db449..0000000000 --- a/doc/common/samples/keystone.conf +++ /dev/null @@ -1,263 +0,0 @@ -[DEFAULT] -# A "shared secret" between keystone and other OpenStack services -# admin_token = ADMIN - -# The IP address of the network interface to listen on -# public_bind_host = 0.0.0.0 -# admin_bind_host = 0.0.0.0 - -# The port number which the public service listens on -# public_port = 5000 - -# The port number which the public admin listens on -# admin_port = 35357 - -# The base endpoint URLs for keystone that are advertised to clients -# (NOTE: this does NOT affect how keystone listens for connections) -# public_endpoint = http://localhost:%(public_port)s/ -# admin_endpoint = http://localhost:%(admin_port)s/ - -# The port number which the OpenStack Compute service listens on -# compute_port = 8774 - -# Path to your policy definition containing identity actions -# policy_file = policy.json - -# Rule to check if no matching policy definition is found -# FIXME(dolph): This should really be defined as [policy] default_rule -# policy_default_rule = admin_required - -# Role for migrating membership relationships -# During a SQL upgrade, the following values will be used to create a new role -# that will replace records in the user_tenant_membership table with explicit -# role grants. After migration, the member_role_id will be used in the API -# add_user_to_project, and member_role_name will be ignored. -# member_role_id = 9fe2ff9ee4384b1894a90878d3e92bab -# member_role_name = _member_ - -# enforced by optional sizelimit middleware (keystone.middleware:RequestBodySizeLimiter) -# max_request_body_size = 114688 - -# limit the sizes of user & tenant ID/names -# max_param_size = 64 - -# similar to max_param_size, but provides an exception for token values -# max_token_size = 8192 - -# === Logging Options === -# Print debugging output -# (includes plaintext request logging, potentially including passwords) -# debug = False - -# Print more verbose output -# verbose = False - -# Name of log file to output to. If not set, logging will go to stdout. -# log_file = keystone.log - -# The directory to keep log files in (will be prepended to --logfile) -# log_dir = /var/log/keystone - -# Use syslog for logging. -# use_syslog = False - -# syslog facility to receive log lines -# syslog_log_facility = LOG_USER - -# If this option is specified, the logging configuration file specified is -# used and overrides any other logging options specified. Please see the -# Python logging module documentation for details on logging configuration -# files. -# log_config = logging.conf - -# A logging.Formatter log message format string which may use any of the -# available logging.LogRecord attributes. -# log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s - -# Format string for %(asctime)s in log records. -# log_date_format = %Y-%m-%d %H:%M:%S - -# onready allows you to send a notification when the process is ready to serve -# For example, to have it notify using systemd, one could set shell command: -# onready = systemd-notify --ready -# or a module with notify() method: -# onready = keystone.common.systemd - -[sql] -# The SQLAlchemy connection string used to connect to the database -# connection = sqlite:///keystone.db - -# the timeout before idle sql connections are reaped -# idle_timeout = 200 - -[identity] -# driver = keystone.identity.backends.sql.Identity - -# This references the domain to use for all Identity API v2 requests (which are -# not aware of domains). A domain with this ID will be created for you by -# keystone-manage db_sync in migration 008. The domain referenced by this ID -# cannot be deleted on the v3 API, to prevent accidentally breaking the v2 API. -# There is nothing special about this domain, other than the fact that it must -# exist to order to maintain support for your v2 clients. -# default_domain_id = default - -[credential] -# driver = keystone.credential.backends.sql.Credential - -[trust] -# driver = keystone.trust.backends.sql.Trust - -# delegation and impersonation features can be optionally disabled -# enabled = True - -[catalog] -# dynamic, sql-based backend (supports API/CLI-based management commands) -# driver = keystone.catalog.backends.sql.Catalog - -# static, file-based backend (does *NOT* support any management commands) -# driver = keystone.catalog.backends.templated.TemplatedCatalog - -# template_file = default_catalog.templates - -[token] -# driver = keystone.token.backends.sql.Token - -# Amount of time a token should remain valid (in seconds) -# expiration = 86400 - -[policy] -# driver = keystone.policy.backends.sql.Policy - -[ec2] -# driver = keystone.contrib.ec2.backends.kvs.Ec2 - -[ssl] -#enable = True -#certfile = /etc/keystone/pki/certs/ssl_cert.pem -#keyfile = /etc/keystone/pki/private/ssl_key.pem -#ca_certs = /etc/keystone/pki/certs/cacert.pem -#ca_key = /etc/keystone/pki/private/cakey.pem -#key_size = 1024 -#valid_days = 3650 -#ca_password = None -#cert_required = False -#cert_subject = /C=US/ST=Unset/L=Unset/O=Unset/CN=localhost - -[signing] -#token_format = PKI -#certfile = /etc/keystone/pki/certs/signing_cert.pem -#keyfile = /etc/keystone/pki/private/signing_key.pem -#ca_certs = /etc/keystone/pki/certs/cacert.pem -#ca_key = /etc/keystone/pki/private/cakey.pem -#key_size = 2048 -#valid_days = 3650 -#ca_password = None -#cert_subject = /C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com - -[ldap] -# url = ldap://localhost -# user = dc=Manager,dc=example,dc=com -# password = None -# suffix = cn=example,cn=com -# use_dumb_member = False -# allow_subtree_delete = False -# dumb_member = cn=dumb,dc=example,dc=com - -# Maximum results per page; a value of zero ('0') disables paging (default) -# page_size = 0 - -# The LDAP dereferencing option for queries. This can be either 'never', -# 'searching', 'always', 'finding' or 'default'. The 'default' option falls -# back to using default dereferencing configured by your ldap.conf. -# alias_dereferencing = default - -# The LDAP scope for queries, this can be either 'one' -# (onelevel/singleLevel) or 'sub' (subtree/wholeSubtree) -# query_scope = one - -# user_tree_dn = ou=Users,dc=example,dc=com -# user_filter = -# user_objectclass = inetOrgPerson -# user_domain_id_attribute = businessCategory -# user_id_attribute = cn -# user_name_attribute = sn -# user_mail_attribute = email -# user_pass_attribute = userPassword -# user_enabled_attribute = enabled -# user_enabled_mask = 0 -# user_enabled_default = True -# user_attribute_ignore = tenant_id,tenants -# user_allow_create = True -# user_allow_update = True -# user_allow_delete = True -# user_enabled_emulation = False -# user_enabled_emulation_dn = - -# tenant_tree_dn = ou=Projects,dc=example,dc=com -# tenant_filter = -# tenant_objectclass = groupOfNames -# tenant_domain_id_attribute = businessCategory -# tenant_id_attribute = cn -# tenant_member_attribute = member -# tenant_name_attribute = ou -# tenant_desc_attribute = desc -# tenant_enabled_attribute = enabled -# tenant_attribute_ignore = -# tenant_allow_create = True -# tenant_allow_update = True -# tenant_allow_delete = True -# tenant_enabled_emulation = False -# tenant_enabled_emulation_dn = - -# role_tree_dn = ou=Roles,dc=example,dc=com -# role_filter = -# role_objectclass = organizationalRole -# role_id_attribute = cn -# role_name_attribute = ou -# role_member_attribute = roleOccupant -# role_attribute_ignore = -# role_allow_create = True -# role_allow_update = True -# role_allow_delete = True - -# group_tree_dn = -# group_filter = -# group_objectclass = groupOfNames -# group_id_attribute = cn -# group_name_attribute = ou -# group_member_attribute = member -# group_desc_attribute = desc -# group_attribute_ignore = -# group_allow_create = True -# group_allow_update = True -# group_allow_delete = True - -# ldap TLS options -# if both tls_cacertfile and tls_cacertdir are set then -# tls_cacertfile will be used and tls_cacertdir is ignored -# valid options for tls_req_cert are demand, never, and allow -# use_tls = False -# tls_cacertfile = -# tls_cacertdir = -# tls_req_cert = demand - -# Additional attribute mappings can be used to map ldap attributes to internal -# keystone attributes. This allows keystone to fulfill ldap objectclass -# requirements. An example to map the description and gecos attributes to a -# user's name would be: -# user_additional_attribute_mapping = description:name, gecos:name -# -# domain_additional_attribute_mapping = -# group_additional_attribute_mapping = -# role_additional_attribute_mapping = -# project_additional_attribute_mapping = -# user_additional_attribute_mapping = - -[auth] -methods = password,token -password = keystone.auth.plugins.password.Password -token = keystone.auth.plugins.token.Token - -[paste_deploy] -# Name of the paste configuration file that defines the available pipelines -config_file = keystone-paste.ini diff --git a/doc/common/samples/list_metadata.json b/doc/common/samples/list_metadata.json deleted file mode 100644 index 5ffa1ca0ed..0000000000 --- a/doc/common/samples/list_metadata.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "uuid": "d8e02d56-2648-49a3-bf97-6be8f1204f38", - "availability_zone": "nova", - "hostname": "test.novalocal", - "launch_index": 0, - "meta": { - "priority": "low", - "role": "webserver" - }, - "project_id": "f7ac731cc11f40efbc03a9f9e1d1d21f", - "public_keys": { - "mykey": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDYVEprvtYJXVOBN0XNKVVRNCRX6BlnNbI+USLGais1sUWPwtSg7z9K9vhbYAPUZcq8c/s5S9dg5vTHbsiyPCIDOKyeHba4MUJq8Oh5b2i71/3BISpyxTBH/uZDHdslW2a+SrPDCeuMMoss9NFhBdKtDkdG9zyi0ibmCP6yMdEX8Q== Generated by Nova\n" - }, - "name": "test" -} diff --git a/doc/common/samples/local_settings.py b/doc/common/samples/local_settings.py deleted file mode 100644 index d603cb8828..0000000000 --- a/doc/common/samples/local_settings.py +++ /dev/null @@ -1,127 +0,0 @@ -import os - -from django.utils.translation import ugettext_lazy as _ - -DEBUG = False -TEMPLATE_DEBUG = DEBUG -PROD = True -USE_SSL = False - -SITE_BRANDING = 'OpenStack Dashboard' - -# Ubuntu-specific: Enables an extra panel in the 'Settings' section -# that easily generates a Juju environments.yaml for download, -# preconfigured with endpoints and credentials required for bootstrap -# and service deployment. -ENABLE_JUJU_PANEL = True - -# Note: You should change this value -SECRET_KEY = 'elj1IWiLoWHgryYxFT6j7cM5fGOOxWY0' - -# Specify a regular expression to validate user passwords. -# HORIZON_CONFIG = { -# "password_validator": { -# "regex": '.*', -# "help_text": _("Your password does not meet the requirements.") -# } -# } - -LOCAL_PATH = os.path.dirname(os.path.abspath(__file__)) - -CACHES = { - 'default': { - 'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION' : '127.0.0.1:11211' - } -} - -# Send email to the console by default -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' -# Or send them to /dev/null -#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' - -# Configure these for your outgoing email host -# EMAIL_HOST = 'smtp.my-company.com' -# EMAIL_PORT = 25 -# EMAIL_HOST_USER = 'djangomail' -# EMAIL_HOST_PASSWORD = 'top-secret!' - -# For multiple regions uncomment this configuration, and add (endpoint, title). -# AVAILABLE_REGIONS = [ -# ('http://cluster1.example.com:5000/v2.0', 'cluster1'), -# ('http://cluster2.example.com:5000/v2.0', 'cluster2'), -# ] - -OPENSTACK_HOST = "127.0.0.1" -OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST -OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member" - -# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the -# capabilities of the auth backend for Keystone. -# If Keystone has been configured to use LDAP as the auth backend then set -# can_edit_user to False and name to 'ldap'. -# -# TODO(tres): Remove these once Keystone has an API to identify auth backend. -OPENSTACK_KEYSTONE_BACKEND = { - 'name': 'native', - 'can_edit_user': True -} - -# OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints -# in the Keystone service catalog. Use this setting when Horizon is running -# external to the OpenStack environment. The default is 'internalURL'. -#OPENSTACK_ENDPOINT_TYPE = "publicURL" - -# The number of Swift containers and objects to display on a single page before -# providing a paging element (a "more" link) to paginate results. -API_RESULT_LIMIT = 1000 - -# If you have external monitoring links, eg: -# EXTERNAL_MONITORING = [ -# ['Nagios','http://foo.com'], -# ['Ganglia','http://bar.com'], -# ] - -LOGGING = { - 'version': 1, - # When set to True this will disable all logging except - # for loggers specified in this configuration dictionary. Note that - # if nothing is specified here and disable_existing_loggers is True, - # django.db.backends will still log unless it is disabled explicitly. - 'disable_existing_loggers': False, - 'handlers': { - 'null': { - 'level': 'DEBUG', - 'class': 'django.utils.log.NullHandler', - }, - 'console': { - # Set the level to "DEBUG" for verbose output logging. - 'level': 'INFO', - 'class': 'logging.StreamHandler', - }, - }, - 'loggers': { - # Logging from django.db.backends is VERY verbose, send to null - # by default. - 'django.db.backends': { - 'handlers': ['null'], - 'propagate': False, - }, - 'horizon': { - 'handlers': ['console'], - 'propagate': False, - }, - 'novaclient': { - 'handlers': ['console'], - 'propagate': False, - }, - 'keystoneclient': { - 'handlers': ['console'], - 'propagate': False, - }, - 'nose.plugins.manager': { - 'handlers': ['console'], - 'propagate': False, - } - } -} diff --git a/doc/common/samples/networking_auth.json b/doc/common/samples/networking_auth.json deleted file mode 100644 index eb29d84ace..0000000000 --- a/doc/common/samples/networking_auth.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "admin_or_owner": [ - [ - "role:admin" - ], - [ - "tenant_id:%(tenant_id)s" - ] - ], - "admin_or_network_owner": [ - [ - "role:admin" - ], - [ - "tenant_id:%(network_tenant_id)s" - ] - ], - "admin_only": [ - [ - "role:admin" - ] - ], - "regular_user": [], - "shared": [ - [ - "field:networks:shared=True" - ] - ], - "default": [ - [ - "rule:admin_or_owner" - ] - ], - "create_subnet": [ - [ - "rule:admin_or_network_owner" - ] - ], - "get_subnet": [ - [ - "rule:admin_or_owner" - ], - [ - "rule:shared" - ] - ], - "update_subnet": [ - [ - "rule:admin_or_network_owner" - ] - ], - "delete_subnet": [ - [ - "rule:admin_or_network_owner" - ] - ], - "create_network": [], - "get_network": [ - [ - "rule:admin_or_owner" - ], - [ - "rule:shared" - ] - ], - "create_network:shared": [ - [ - "rule:admin_only" - ] - ], - "update_network": [ - [ - "rule:admin_or_owner" - ] - ], - "delete_network": [ - [ - "rule:admin_or_owner" - ] - ], - "create_port": [], - "create_port:mac_address": [ - [ - "rule:admin_or_network_owner" - ] - ], - "create_port:fixed_ips": [ - [ - "rule:admin_or_network_owner" - ] - ], - "get_port": [ - [ - "rule:admin_or_owner" - ] - ], - "update_port": [ - [ - "rule:admin_or_owner" - ] - ], - "delete_port": [ - [ - "rule:admin_or_owner" - ] - ] -} diff --git a/doc/common/samples/neutron-hyperv-agent.conf b/doc/common/samples/neutron-hyperv-agent.conf deleted file mode 100644 index 50d4170a60..0000000000 --- a/doc/common/samples/neutron-hyperv-agent.conf +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -verbose = true -control_exchange = neutron -policy_file = C:\etc\policy.json -rpc_backend = neutron.openstack.common.rpc.impl_kombu -rabbit_host = IP_ADDRESS -rabbit_port = 5672 -rabbit_userid = guest -rabbit_password = -logdir = C:\OpenStack\Log -logfile = neutron-hyperv-agent.log - -[AGENT] -polling_interval = 2 -physical_network_vswitch_mappings = *:YOUR_BRIDGE_NAME -enable_metrics_collection = true - -[SECURITYGROUP] -firewall_driver = neutron.plugins.hyperv.agent.security_groups_driver.HyperVSecurityGroupsDriver -enable_security_group = true diff --git a/doc/common/samples/nova.conf b/doc/common/samples/nova.conf deleted file mode 100644 index d147ae5740..0000000000 --- a/doc/common/samples/nova.conf +++ /dev/null @@ -1,75 +0,0 @@ -[DEFAULT] - -# LOGS/STATE -verbose=True -logdir=/var/log/nova -state_path=/var/lib/nova -lock_path=/var/lock/nova -rootwrap_config=/etc/nova/rootwrap.conf - -# SCHEDULER -compute_scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler - -# VOLUMES -# configured in cinder.conf - -# COMPUTE -compute_driver=libvirt.LibvirtDriver -instance_name_template=instance-%08x -api_paste_config=/etc/nova/api-paste.ini - -# COMPUTE/APIS: if you have separate configs for separate services -# this flag is required for both nova-api and nova-compute -allow_resize_to_same_host=True - -# APIS -osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions -ec2_dmz_host=192.168.206.130 -s3_host=192.168.206.130 - -# RABBITMQ -rabbit_host=192.168.206.130 - -# GLANCE -image_service=nova.image.glance.GlanceImageService - -# NETWORK -network_manager=nova.network.manager.FlatDHCPManager -force_dhcp_release=True -dhcpbridge_flagfile=/etc/nova/nova.conf -firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver -# Change my_ip to match each host -my_ip=192.168.206.130 -public_interface=eth0 -vlan_interface=eth0 -flat_network_bridge=br100 -flat_interface=eth0 - -# NOVNC CONSOLE -novncproxy_base_url=http://192.168.206.130:6080/vnc_auto.html -# Change vncserver_proxyclient_address and vncserver_listen to match each compute host -vncserver_proxyclient_address=192.168.206.130 -vncserver_listen=192.168.206.130 - -# AUTHENTICATION -auth_strategy=keystone -[keystone_authtoken] -auth_host = 127.0.0.1 -auth_port = 35357 -auth_protocol = http -admin_tenant_name = service -admin_user = nova -admin_password = nova -signing_dirname = /tmp/keystone-signing-nova - -# GLANCE -[glance] -api_servers=192.168.206.130:9292 - -# DATABASE -[database] -connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova - -# LIBVIRT -[libvirt] -virt_type=qemu \ No newline at end of file diff --git a/doc/common/samples/nova.conf-yum b/doc/common/samples/nova.conf-yum deleted file mode 100644 index 01a45bfabe..0000000000 --- a/doc/common/samples/nova.conf-yum +++ /dev/null @@ -1,74 +0,0 @@ -[DEFAULT] - -# LOGS/STATE -verbose=True -logdir=/var/log/nova -state_path=/var/lib/nova -lock_path=/var/lock/nova -rootwrap_config=/etc/nova/rootwrap.conf - -# SCHEDULER -compute_scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler - -# VOLUMES -# configured in cinder.conf - -# COMPUTE -libvirt_type=qemu -compute_driver=libvirt.LibvirtDriver -instance_name_template=instance-%08x -api_paste_config=/etc/nova/api-paste.ini - -# COMPUTE/APIS: if you have separate configs for separate services -# this flag is required for both nova-api and nova-compute -allow_resize_to_same_host=True - -# APIS -osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions -ec2_dmz_host=192.168.206.130 -s3_host=192.168.206.130 - -# QPID -rpc_backend=nova.rpc.impl_qpid -qpid_hostname=192.168.206.130 - -# GLANCE -image_service=nova.image.glance.GlanceImageService - -# NETWORK -network_manager=nova.network.manager.FlatDHCPManager -force_dhcp_release=True -dhcpbridge_flagfile=/etc/nova/nova.conf -firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver -# Change my_ip to match each host -my_ip=192.168.206.130 -public_interface=eth100 -vlan_interface=eth0 -flat_network_bridge=br100 -flat_interface=eth0 -fixed_range=192.168.100.0/24 - -# NOVNC CONSOLE -novncproxy_base_url=http://192.168.206.130:6080/vnc_auto.html -# Change vncserver_proxyclient_address and vncserver_listen to match each compute host -vncserver_proxyclient_address=192.168.206.130 -vncserver_listen=192.168.206.130 - -# AUTHENTICATION -auth_strategy=keystone -[keystone_authtoken] -auth_host = 127.0.0.1 -auth_port = 35357 -auth_protocol = http -admin_tenant_name = service -admin_user = nova -admin_password = nova -signing_dirname = /tmp/keystone-signing-nova - -# GLANCE -[glance] -api_servers=192.168.206.130:9292 - -# DATABASE -[database] -connection=mysql+pymysql://nova:yourpassword@192.168.206.130/nova diff --git a/doc/common/samples/policy.json b/doc/common/samples/policy.json deleted file mode 100644 index 8f3a7b2f97..0000000000 --- a/doc/common/samples/policy.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "context_is_admin": "role:admin", - "admin_or_owner": "is_admin:True or project_id:%(project_id)s", - "default": "rule:admin_or_owner", - - "admin_api": "is_admin:True", - - "volume:create": "", - "volume:get_all": "", - "volume:get_volume_metadata": "", - "volume:get_volume_admin_metadata": "rule:admin_api", - "volume:delete_volume_admin_metadata": "rule:admin_api", - "volume:update_volume_admin_metadata": "rule:admin_api", - "volume:get_snapshot": "", - "volume:get_all_snapshots": "", - "volume:extend": "", - "volume:update_readonly_flag": "", - "volume:retype": "", - - "volume_extension:types_manage": "rule:admin_api", - "volume_extension:types_extra_specs": "rule:admin_api", - "volume_extension:volume_type_encryption": "rule:admin_api", - "volume_extension:volume_encryption_metadata": "rule:admin_or_owner", - "volume_extension:extended_snapshot_attributes": "", - "volume_extension:volume_image_metadata": "", - - "volume_extension:quotas:show": "", - "volume_extension:quotas:update": "rule:admin_api", - "volume_extension:quota_classes": "", - - "volume_extension:volume_admin_actions:reset_status": "rule:admin_api", - "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api", - "volume_extension:backup_admin_actions:reset_status": "rule:admin_api", - "volume_extension:volume_admin_actions:force_delete": "rule:admin_api", - "volume_extension:volume_admin_actions:force_detach": "rule:admin_api", - "volume_extension:snapshot_admin_actions:force_delete": "rule:admin_api", - "volume_extension:volume_admin_actions:migrate_volume": "rule:admin_api", - "volume_extension:volume_admin_actions:migrate_volume_completion": "rule:admin_api", - - "volume_extension:volume_host_attribute": "rule:admin_api", - "volume_extension:volume_tenant_attribute": "rule:admin_or_owner", - "volume_extension:volume_mig_status_attribute": "rule:admin_api", - "volume_extension:hosts": "rule:admin_api", - "volume_extension:services": "rule:admin_api", - - "volume_extension:volume_manage": "rule:admin_api", - "volume_extension:volume_unmanage": "rule:admin_api", - - "volume:services": "rule:admin_api", - - "volume:create_transfer": "", - "volume:accept_transfer": "", - "volume:delete_transfer": "", - "volume:get_all_transfers": "", - - "volume_extension:replication:promote": "rule:admin_api", - "volume_extension:replication:reenable": "rule:admin_api", - - "backup:create" : "", - "backup:delete": "", - "backup:get": "", - "backup:get_all": "", - "backup:restore": "", - "backup:backup-import": "rule:admin_api", - "backup:backup-export": "rule:admin_api", - - "snapshot_extension:snapshot_actions:update_snapshot_status": "", - - "consistencygroup:create" : "group:nobody", - "consistencygroup:delete": "group:nobody", - "consistencygroup:get": "group:nobody", - "consistencygroup:get_all": "group:nobody", - - "consistencygroup:create_cgsnapshot" : "", - "consistencygroup:delete_cgsnapshot": "", - "consistencygroup:get_cgsnapshot": "", - "consistencygroup:get_all_cgsnapshots": "", - - "scheduler_extension:scheduler_stats:get_pools" : "rule:admin_api" -} diff --git a/doc/common/samples/restrict_roles_new_syntax.json b/doc/common/samples/restrict_roles_new_syntax.json deleted file mode 100644 index 0597e77a69..0000000000 --- a/doc/common/samples/restrict_roles_new_syntax.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "admin_or_owner": "role:admin or project_id:%(project_id)s", - "default": "rule:admin_or_owner", - "compute:create": "role:compute-user", - "compute:create:attach_network": "role:compute-user", - "compute:create:attach_volume": "role:compute-user", - "compute:get_all": "role:compute-user", - "compute:unlock_override": "rule:admin_api", - "admin_api": "role:admin", - "compute_extension:accounts": "rule:admin_api", - "compute_extension:admin_actions": "rule:admin_api", - "compute_extension:admin_actions:pause": "rule:admin_or_owner", - "compute_extension:admin_actions:unpause": "rule:admin_or_owner", - "compute_extension:admin_actions:suspend": "rule:admin_or_owner", - "compute_extension:admin_actions:resume": "rule:admin_or_owner", - "compute_extension:admin_actions:lock": "rule:admin_or_owner", - "compute_extension:admin_actions:unlock": "rule:admin_or_owner", - "compute_extension:admin_actions:resetNetwork": "rule:admin_api", - "compute_extension:admin_actions:injectNetworkInfo": "rule:admin_api", - "compute_extension:admin_actions:createBackup": "rule:admin_or_owner", - "compute_extension:admin_actions:migrateLive": "rule:admin_api", - "compute_extension:admin_actions:migrate": "rule:admin_api", - "compute_extension:aggregates": "rule:admin_api", - "compute_extension:certificates": "role:compute-user", - "compute_extension:cloudpipe": "rule:admin_api", - "compute_extension:console_output": "role:compute-user", - "compute_extension:consoles": "role:compute-user", - "compute_extension:createserverext": "role:compute-user", - "compute_extension:deferred_delete": "role:compute-user", - "compute_extension:disk_config": "role:compute-user", - "compute_extension:evacuate": "rule:admin_api", - "compute_extension:extended_server_attributes": "rule:admin_api", - "compute_extension:extended_status": "role:compute-user", - "compute_extension:flavorextradata": "role:compute-user", - "compute_extension:flavorextraspecs": "role:compute-user", - "compute_extension:flavormanage": "rule:admin_api", - "compute_extension:floating_ip_dns": "role:compute-user", - "compute_extension:floating_ip_pools": "role:compute-user", - "compute_extension:floating_ips": "role:compute-user", - "compute_extension:hosts": "rule:admin_api", - "compute_extension:keypairs": "role:compute-user", - "compute_extension:multinic": "role:compute-user", - "compute_extension:networks": "rule:admin_api", - "compute_extension:quotas": "role:compute-user", - "compute_extension:rescue": "role:compute-user", - "compute_extension:security_groups": "role:compute-user", - "compute_extension:server_action_list": "rule:admin_api", - "compute_extension:server_diagnostics": "rule:admin_api", - "compute_extension:simple_tenant_usage:show": "rule:admin_or_owner", - "compute_extension:simple_tenant_usage:list": "rule:admin_api", - "compute_extension:users": "rule:admin_api", - "compute_extension:virtual_interfaces": "role:compute-user", - "compute_extension:virtual_storage_arrays": "role:compute-user", - "compute_extension:volumes": "role:compute-user", - "compute_extension:volume_attachments:index": "role:compute-user", - "compute_extension:volume_attachments:show": "role:compute-user", - "compute_extension:volume_attachments:create": "role:compute-user", - "compute_extension:volume_attachments:delete": "role:compute-user", - "compute_extension:volumetypes": "role:compute-user", - "volume:create": "role:compute-user", - "volume:get_all": "role:compute-user", - "volume:get_volume_metadata": "role:compute-user", - "volume:get_snapshot": "role:compute-user", - "volume:get_all_snapshots": "role:compute-user", - "network:get_all_networks": "role:compute-user", - "network:get_network": "role:compute-user", - "network:delete_network": "role:compute-user", - "network:disassociate_network": "role:compute-user", - "network:get_vifs_by_instance": "role:compute-user", - "network:allocate_for_instance": "role:compute-user", - "network:deallocate_for_instance": "role:compute-user", - "network:validate_networks": "role:compute-user", - "network:get_instance_uuids_by_ip_filter": "role:compute-user", - "network:get_floating_ip": "role:compute-user", - "network:get_floating_ip_pools": "role:compute-user", - "network:get_floating_ip_by_address": "role:compute-user", - "network:get_floating_ips_by_project": "role:compute-user", - "network:get_floating_ips_by_fixed_address": "role:compute-user", - "network:allocate_floating_ip": "role:compute-user", - "network:deallocate_floating_ip": "role:compute-user", - "network:associate_floating_ip": "role:compute-user", - "network:disassociate_floating_ip": "role:compute-user", - "network:get_fixed_ip": "role:compute-user", - "network:add_fixed_ip_to_instance": "role:compute-user", - "network:remove_fixed_ip_from_instance": "role:compute-user", - "network:add_network_to_project": "role:compute-user", - "network:get_instance_nw_info": "role:compute-user", - "network:get_dns_domains": "role:compute-user", - "network:add_dns_entry": "role:compute-user", - "network:modify_dns_entry": "role:compute-user", - "network:delete_dns_entry": "role:compute-user", - "network:get_dns_entries_by_address": "role:compute-user", - "network:get_dns_entries_by_name": "role:compute-user", - "network:create_private_dns_domain": "role:compute-user", - "network:create_public_dns_domain": "role:compute-user", - "network:delete_dns_domain": "role:compute-user" -} diff --git a/doc/common/samples/server-scheduler-hints.json b/doc/common/samples/server-scheduler-hints.json deleted file mode 100644 index 03eef76f72..0000000000 --- a/doc/common/samples/server-scheduler-hints.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "server": { - "name": "server-1", - "imageRef": "cedef40a-ed67-4d10-800e-17455edce175", - "flavorRef": "1" - }, - "os:scheduler_hints": { - "different_host": [ - "a0cf03a5-d921-4877-bb5c-86d26cf818e1", - "8c19174f-4220-44f0-824a-cd1eeef10287" - ] - } -} diff --git a/doc/common/samples/server-scheduler-hints2.json b/doc/common/samples/server-scheduler-hints2.json deleted file mode 100644 index ca760e5a16..0000000000 --- a/doc/common/samples/server-scheduler-hints2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "server": { - "name": "server-1", - "imageRef": "cedef40a-ed67-4d10-800e-17455edce175", - "flavorRef": "1" - }, - "os:scheduler_hints": { - "query": "[>=,$free_ram_mb,1024]" - } -} diff --git a/doc/common/samples/server-scheduler-hints3.json b/doc/common/samples/server-scheduler-hints3.json deleted file mode 100644 index 85a2b1e776..0000000000 --- a/doc/common/samples/server-scheduler-hints3.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "server": { - "name": "server-1", - "imageRef": "cedef40a-ed67-4d10-800e-17455edce175", - "flavorRef": "1" - }, - "os:scheduler_hints": { - "same_host": [ - "a0cf03a5-d921-4877-bb5c-86d26cf818e1", - "8c19174f-4220-44f0-824a-cd1eeef10287" - ] - } -} diff --git a/doc/common/samples/server-scheduler-hints4.json b/doc/common/samples/server-scheduler-hints4.json deleted file mode 100644 index 410e1d6502..0000000000 --- a/doc/common/samples/server-scheduler-hints4.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "server": { - "name": "server-1", - "imageRef": "cedef40a-ed67-4d10-800e-17455edce175", - "flavorRef": "1" - }, - "os:scheduler_hints": { - "build_near_host_ip": "192.168.1.1", - "cidr": "24" - } -} diff --git a/doc/common/samples/token.json b/doc/common/samples/token.json deleted file mode 100644 index 6a167fb584..0000000000 --- a/doc/common/samples/token.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "token": { - "expires": "2013-06-26T16:52:50Z", - "id": "MIIKXAY...", - "issued_at": "2013-06-25T16:52:50.622502", - "tenant": { - "description": null, - "enabled": true, - "id": "912426c8f4c04fb0a07d2547b0704185", - "name": "demo" - } - } -} diff --git a/doc/common/samples/xml_curl.txt b/doc/common/samples/xml_curl.txt deleted file mode 100644 index 84df911601..0000000000 --- a/doc/common/samples/xml_curl.txt +++ /dev/null @@ -1,7 +0,0 @@ -curl -i https://dfw.servers.api.rackspacecloud.com/v2/$account/servers.xml \ - -X POST \ - -H "X-Auth-Project-Id: $account" \ - -H "Content-Type: application/xml" \ - -H "Accept: application/xml" \ - -H "X-Auth-Token: $token" \ - -T server_post_req.xml | ppxml diff --git a/doc/common/section_about-object-storage.xml b/doc/common/section_about-object-storage.xml deleted file mode 100644 index a45ff2412f..0000000000 --- a/doc/common/section_about-object-storage.xml +++ /dev/null @@ -1,31 +0,0 @@ - -
- Introduction to Object Storage - Object Storage is a robust, highly scalable and - fault tolerant storage platform for unstructured data - such as objects. Objects are stored bits, accessed - through a RESTful, HTTP-based interface. You cannot access - data at the block or file level. Object Storage is commonly - used to archive and back up data, with use cases in - virtual machine image, photo, video and music storage. - Object Storage provides a high degree of availability, throughput, - and performance with its scale out architecture. Each object is - replicated across multiple servers, residing within the - same data center or across data centers, which mitigates the risk - of network and hardware failure. In the event of hardware failure, - Object Storage will automatically copy objects to a new location - to ensure that there are always three copies available. - Object Storage is an eventually consistent distributed storage - platform; it sacrifices consistency for maximum - availability and partition tolerance. Object Storage enables you to - create a reliable platform by using commodity hardware and - inexpensive storage. - For more information, review the key concepts - in the developer documentation at docs.openstack.org/developer/swift/. -
diff --git a/doc/common/section_cli_nova_host_aggregates.xml b/doc/common/section_cli_nova_host_aggregates.xml deleted file mode 100644 index 5dfdf61cde..0000000000 --- a/doc/common/section_cli_nova_host_aggregates.xml +++ /dev/null @@ -1,271 +0,0 @@ - - -%openstack; -]> -
- Host aggregates and availability zones - - Host aggregates are a mechanism for partitioning hosts in an OpenStack - cloud, or a region of an OpenStack cloud, based on arbitrary - characteristics. Examples where an administrator may want to do this - include where a group of hosts have additional hardware or performance - characteristics. - - - Host aggregates are not explicitly exposed to users. - Instead administrators map flavors to host aggregates. Administrators - do this by setting metadata on a host aggregate, and matching flavor - extra specifications. The scheduler then endeavors to match user - requests for instance of the given flavor to a host aggregate with the - same key-value pair in its metadata. Compute nodes can be in more than - one host aggregate. - - - Administrators are able to optionally expose a host aggregate as an - availability zone. Availability zones are different from host aggregates - in that they are explicitly exposed to the user, and hosts can only be - in a single availability zone. Administrators can configure a default - availability zone where instances will be scheduled when the user - fails to specify one. - - - Command-line interface - The nova command-line tool supports - the following aggregate-related commands. - - nova - aggregate-list - - Print a list of all aggregates. - - - - nova aggregate-create - <name> - [availability-zone] - - Create a new aggregate named - <name>, and - optionally in availability zone - [availability-zone] - if specified. The command returns the ID of the - newly created aggregate. Hosts can be made - available to multiple host aggregates. Be careful - when adding a host to an additional host - aggregate when the host is also in an availability - zone. Pay attention when using the - aggregate-set-metadata - and aggregate-update - commands to avoid user confusion when they - boot instances in different availability - zones. An error occurs if you cannot add a - particular host to an aggregate zone for - which it is not intended. - - - - nova aggregate-delete - <id> - - Delete an aggregate with id - <id>. - - - - nova aggregate-details - <id> - - Show details of the aggregate with id - <id>. - - - - nova aggregate-add-host - <id> - <host> - - Add host with name - <host> - to aggregate with id - <id>. - - - - nova aggregate-remove-host - <id> - <host> - - Remove the host with name - <host> - from the aggregate with id - <id>. - - - - nova aggregate-set-metadata - <id> - <key=value> - [<key=value> - ...] - - Add or update metadata (key-value pairs) - associated with the aggregate with id - <id>. - - - - nova aggregate-update - <id> - <name> - [<availability_zone>] - - Update the name and availability zone - (optional) for the aggregate. - - - - nova host-list - - List all hosts by service. - - - - nova host-update --maintenance - [enable | disable] - - Put/resume host into/from - maintenance. - - - - - Only administrators can access these commands. If - you try to use these commands and the user name and - tenant that you use to access the Compute service do - not have the admin role or the - appropriate privileges, these errors occur: - ERROR: Policy doesn't allow compute_extension:aggregates to be performed. (HTTP 403) (Request-ID: req-299fbff6-6729-4cef-93b2-e7e1f96b4864) - - ERROR: Policy doesn't allow compute_extension:hosts to be performed. (HTTP 403) (Request-ID: req-ef2400f6-6776-4ea3-b6f1-7704085c27d1) - - - - - Configure scheduler to support host aggregates - One common use case for host aggregates is when you want - to support scheduling instances to a subset of compute - hosts because they have a specific capability. For - example, you may want to allow users to request compute - hosts that have SSD drives if they need access to faster - disk I/O, or access to compute hosts that have GPU cards - to take advantage of GPU-accelerated code. - To configure the scheduler to support host aggregates, - the scheduler_default_filters - configuration option must contain the - AggregateInstanceExtraSpecsFilter - in addition to the other filters used by the scheduler. - Add the following line to - /etc/nova/nova.conf on the host - that runs the nova-scheduler service to enable host - aggregates filtering, as well as the other filters that - are typically - enabled:scheduler_default_filters=AggregateInstanceExtraSpecsFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter - - - Example: Specify compute hosts with SSDs - This example configures the Compute service to enable - users to request nodes that have solid-state drives - (SSDs). You create a fast-io host - aggregate in the nova availability zone - and you add the ssd=true key-value pair - to the aggregate. Then, you add the - node1, and node2 - compute nodes to it. - $ nova aggregate-create fast-io nova -+----+---------+-------------------+-------+----------+ -| Id | Name | Availability Zone | Hosts | Metadata | -+----+---------+-------------------+-------+----------+ -| 1 | fast-io | nova | | | -+----+---------+-------------------+-------+----------+ - -$ nova aggregate-set-metadata 1 ssd=true -+----+---------+-------------------+-------+-------------------+ -| Id | Name | Availability Zone | Hosts | Metadata | -+----+---------+-------------------+-------+-------------------+ -| 1 | fast-io | nova | [] | {u'ssd': u'true'} | -+----+---------+-------------------+-------+-------------------+ - -$ nova aggregate-add-host 1 node1 -+----+---------+-------------------+-----------+-------------------+ -| Id | Name | Availability Zone | Hosts | Metadata | -+----+---------+-------------------+------------+-------------------+ -| 1 | fast-io | nova | [u'node1'] | {u'ssd': u'true'} | -+----+---------+-------------------+------------+-------------------+ - -$ nova aggregate-add-host 1 node2 -+----+---------+-------------------+---------------------+-------------------+ -| Id | Name | Availability Zone | Hosts | Metadata | -+----+---------+-------------------+----------------------+-------------------+ -| 1 | fast-io | nova | [u'node1', u'node2'] | {u'ssd': u'true'} | -+----+---------+-------------------+----------------------+-------------------+ - Use the nova flavor-create command to create - the ssd.large flavor called with an ID of - 6, 8 GB of RAM, 80 GB root disk, and four vCPUs. - $ nova flavor-create ssd.large 6 8192 80 4 -+----+-----------+-----------+------+-----------+------+-------+-------------+-----------+ -| ID | Name | Memory_MB | Disk | Ephemeral | Swap | VCPUs | RXTX_Factor | Is_Public | -+----+-----------+-----------+------+-----------+------+-------+-------------+-----------+ -| 6 | ssd.large | 8192 | 80 | 0 | | 4 | 1.0 | True | -+----+-----------+-----------+------+-----------+------+-------+-------------+-----------+ - Once the flavor is created, specify one or more - key-value pairs that match the key-value pairs on the host - aggregates with scope aggregate_instance_extra_specs. In this case, that is the - aggregate_instance_extra_specs:ssd=true key-value pair. Setting a - key-value pair on a flavor is done using the nova - flavor-key command. - $ nova flavor-key ssd.large set aggregate_instance_extra_specs:ssd=true - Once it is set, you should see the - extra_specs property of the - ssd.large flavor populated with a - key of ssd and a corresponding value of - true. - $ nova flavor-show ssd.large -+----------------------------+--------------------------------------------------+ -| Property | Value | -+----------------------------+--------------------------------------------------+ -| OS-FLV-DISABLED:disabled | False | -| OS-FLV-EXT-DATA:ephemeral | 0 | -| disk | 80 | -| extra_specs | {u'aggregate_instance_extra_specs:ssd': u'true'} | -| id | 6 | -| name | ssd.large | -| os-flavor-access:is_public | True | -| ram | 8192 | -| rxtx_factor | 1.0 | -| swap | | -| vcpus | 4 | -+----------------------------+--------------------------------------------------+ - Now, when a user requests an instance with the - ssd.large flavor, the scheduler - only considers hosts with the ssd=true - key-value pair. In this example, these are - node1 and - node2. - - - XenServer hypervisor pools to support live - migration - When using the XenAPI-based hypervisor, the Compute - service uses host aggregates to manage XenServer Resource - pools, which are used in supporting live migration. - - -
diff --git a/doc/common/section_compute-configure-ec2.xml b/doc/common/section_compute-configure-ec2.xml deleted file mode 100644 index a707cf4b7f..0000000000 --- a/doc/common/section_compute-configure-ec2.xml +++ /dev/null @@ -1,15 +0,0 @@ - -
- Configure the EC2 API - You can set options in the nova.conf - configuration file to control which network address and port the - EC2 API listens on, the formatting of some API responses, and - authentication related options. - To customize these options for OpenStack EC2 API, use the configuration - option settings documented in . -
diff --git a/doc/common/section_compute_config-api.xml b/doc/common/section_compute_config-api.xml deleted file mode 100644 index a35a2b6ea8..0000000000 --- a/doc/common/section_compute_config-api.xml +++ /dev/null @@ -1,185 +0,0 @@ - -
- Configure the Compute API - The Compute API, run by the nova-api daemon, is the component of - OpenStack Compute that receives and responds to user requests, - whether they be direct API calls, or via the CLI tools or - dashboard. - - Configure Compute API password handling - The OpenStack Compute API enables users to specify an - administrative password when they create or rebuild a - server instance. If the user does not specify a password, - a random password is generated and returned in the API - response. - In practice, how the admin password is handled depends - on the hypervisor in use and might require additional - configuration of the instance. For example, you might have - to install an agent to handle the password setting. If the - hypervisor and instance configuration do not support - setting a password at server create time, the password - that is returned by the create API call is misleading - because it was ignored. - To prevent this confusion, use the - - configuration option to disable the return of the admin - password for installations that do not support setting - instance passwords. - - - Configure Compute API rate limiting - OpenStack Compute supports API rate limiting for the - OpenStack API. The rate limiting allows an administrator - to configure limits on the type and number of API calls - that can be made in a specific time interval. - When API rate limits are exceeded, HTTP requests return - an error with a status code of 403 - Forbidden. - Rate limiting is not available for the EC2 API. - - - Define limits - To define limits, set these values: - - - The HTTP method - used in the API call, typically one of GET, PUT, - POST, or DELETE. - - - A human readable - URI that is used as a friendly - description of where the limit is applied. - - - A regular - expression. The limit is applied to - all URIs that match the regular expression and - HTTP method. - - - A limit value - that specifies the maximum count of units before - the limit takes effect. - - - An interval - that specifies time frame to which the limit is - applied. The interval can be SECOND, MINUTE, HOUR, - or DAY. - - - Rate limits are applied in relative order to the HTTP - method, going from least to most specific. - - - Default limits - Normally, you install OpenStack Compute with the - following limits enabled: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Default API rate limits
HTTP methodAPI URIAPI regular expressionLimit
POSTany URI (*).*120 per minute
POST/servers^/servers120 per minute
PUTany URI (*).*120 per minute
GET*changes-since*.*changes-since.*120 per minute
DELETEany URI (*).*120 per minute
GET*/os-fping^/os-fping12 per minute
- - - Configure and change limits - As part of the WSGI pipeline, the - etc/nova/api-paste.ini file - defines the actual limits. - To enable limits, include the - ' filter in the API pipeline - specification. If the filter is - removed from the pipeline, limiting is disabled. You must - also define the rate limit filter. The lines appear as - follows: - [pipeline:openstack_compute_api_v2] -pipeline = faultwrap authtoken keystonecontext ratelimit osapi_compute_app_v2 - -[pipeline:openstack_volume_api_v1] -pipeline = faultwrap authtoken keystonecontext ratelimit osapi_volume_app_v1 - -[filter:ratelimit] -paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory - To modify the limits, add a limits - specification to the [filter:ratelimit] - section of the file. Specify the limits in this - order: - - - HTTP method - - - friendly URI - - - regex - - - limit - - - interval - - - The following example shows the default rate-limiting - values: - [filter:ratelimit] -paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory -limits =(POST, "*", .*, 120, MINUTE);(POST, "*/servers", ^/servers, 120, MINUTE);(PUT, "*", .*, 120, MINUTE);(GET, "*changes-since*", .*changes-since.*, 120, MINUTE);(DELETE, "*", .*, 120, MINUTE);(GET, "*/os-fping", ^/os-fping, 12, MINUTE) - - - Configuration reference - The Compute API configuration options are documented in . - -
diff --git a/doc/common/section_config_format.xml b/doc/common/section_config_format.xml deleted file mode 100644 index 25fd66d5c8..0000000000 --- a/doc/common/section_config_format.xml +++ /dev/null @@ -1,220 +0,0 @@ - -
- - - Configuration file format - - - OpenStack uses the INI file format for - configuration files. An INI file is a simple text file that - specifies options as key=value pairs, - grouped into sections. The DEFAULT section - contains most of the configuration options. Lines starting with a - hash sign (#) are comment lines. For example: - - [DEFAULT] -# Print debugging output (set logging level to DEBUG instead -# of default WARNING level). (boolean value) -debug = true -# Print more verbose output (set logging level to INFO instead -# of default WARNING level). (boolean value) -verbose = true - -[database] -# The SQLAlchemy connection string used to connect to the -# database (string value) -connection = mysql+pymysql://keystone:KEYSTONE_DBPASS@controller/keystone - - - - Options can have different types for values. The comments in the - sample config files always mention these. The following types are - used by OpenStack: - - - - boolean value - - - Enables or disables an option. The allowed values are - true and false. - -# Enable the experimental use of database reconnect on -# connection lost (boolean value) -use_db_reconnect = false - - - - floating point value - - A floating point number like 0.25 - or 1000. - -# Sleep time in seconds for polling an ongoing async task -# (floating point value) -task_poll_interval = 0.5 - - - - integer value - - - An integer number is a number without fractional components, - like 0 or 42. - -# The port which the OpenStack Compute service listens on. -# (integer value) -compute_port = 8774 - - - - list value - - - Represents values of other types, separated by commas. As an - example, the following sets - to a list - containing the four elements - oslo.messaging.exceptions, - nova.exception, - cinder.exception, and - exceptions: - - # Modules of exceptions that are permitted to be recreated -# upon receiving exception data from an rpc call. (list value) -allowed_rpc_exception_modules = oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions - - - - multi valued - - - A multi-valued option is a string value and can be given - more than once, all values will be used. - -# Driver or drivers to handle sending notifications. (multi -# valued) -notification_driver = nova.openstack.common.notifier.rpc_notifier -notification_driver = ceilometer.compute.nova_notifier - - - - string value - - - Strings can be optionally enclosed with single or double - quotes. - -# Enables or disables publication of error events. (boolean value) -publish_errors = false - -# The format for an instance that is passed with the log message. -# (string value) -instance_format = "[instance: %(uuid)s] " - - - - - -
- Sections - - Configuration options are grouped by section. Most - configuration files support at least the following sections: - - - - [DEFAULT] - - - Contains most configuration options. If the - documentation for a configuration option does not - specify its section, assume that it appears in this - section. - - - - - [database] - - - Configuration options for the database that stores - the state of the OpenStack service. - - - - - -
- -
- Substitution - - - The configuration file supports variable substitution. After - you set a configuration option, it can be referenced in later - configuration values when you precede it with a - $, like - $OPTION. - - - The following example uses the values of - rabbit_host and - rabbit_port to define the value of the - rabbit_hosts option, in this case as - controller:5672. - -# The RabbitMQ broker address where a single node is used. -# (string value) -rabbit_host = controller - -# The RabbitMQ broker port where a single node is used. -# (integer value) -rabbit_port = 5672 - -# RabbitMQ HA cluster host:port pairs. (list value) -rabbit_hosts = $rabbit_host:$rabbit_port - - - To avoid substitution, use $$, it is replaced - by a single $. For example, if your LDAP DNS - password is $xkj432, specify it, as follows: - ldap_dns_password = $$xkj432 - - - The code uses the Python - string.Template.safe_substitute() method to - implement variable substitution. For more details on how - variable substitution is resolved, see http://docs.python.org/2/library/string.html#template-strings - and PEP 292. - - -
-
- Whitespace - - To include whitespace in a configuration value, use a quoted - string. For example: - ldap_dns_passsword='a password with spaces' -
-
- Define an alternate location for a config file - - Most services and the *-manage command-line - clients load the configuration file. To define an alternate location - for the configuration file, pass the - --config-file - CONFIG_FILE parameter - when you start a service or call a - *-manage command. - -
- -
diff --git a/doc/common/section_dashboard-configure-http.xml b/doc/common/section_dashboard-configure-http.xml deleted file mode 100644 index 26469c6fba..0000000000 --- a/doc/common/section_dashboard-configure-http.xml +++ /dev/null @@ -1,40 +0,0 @@ - -
- Configure the dashboard for HTTP - - You can configure the dashboard for a simple HTTP deployment. The standard installation - uses a non-encrypted HTTP channel. - - - Specify the host for your OpenStack Identity - Service endpoint in the local_settings file(on Fedora/RHEL/ - CentOS: /etc/openstack-dashboard/local_settings, - on Ubuntu and Debian: /etc/openstack-dashboard/local_settings.py, - and on openSUSE: /srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py) - with the OPENSTACK_HOST - setting. - The following example shows this setting: - - The service catalog configuration in the - Identity Service determines whether a service appears - in the dashboard. For the full listing, see - Horizon Settings and - Configuration. - - - Restart Apache http server. For Ubuntu/Debian/SUSE: - # service apache2 restart - or for Fedora/RHEL/CentOS: - # service httpd restart - Next, restart memcached: - # service memcached restart - - -
- diff --git a/doc/common/section_dashboard-configure-https.xml b/doc/common/section_dashboard-configure-https.xml deleted file mode 100644 index bfaff4a3c7..0000000000 --- a/doc/common/section_dashboard-configure-https.xml +++ /dev/null @@ -1,133 +0,0 @@ - -
- Configure the dashboard for HTTPS - You can configure the dashboard for a secured HTTPS - deployment. While the standard installation uses a - non-encrypted HTTP channel, you can enable SSL support for the - dashboard. - - This example uses the - http://openstack.example.com - domain. Use a domain that fits your current setup. - - In the local_settings file(on Fedora/RHEL/ - CentOS: /etc/openstack-dashboard/local_settings, - on Ubuntu and Debian: /etc/openstack-dashboard/local_settings.py, - and on openSUSE: /srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py), - update the following options: - USE_SSL = True -CSRF_COOKIE_SECURE = True -SESSION_COOKIE_SECURE = True -SESSION_COOKIE_HTTPONLY = True - To enable HTTPS, the USE_SSL = True - option is required. - The other options require that HTTPS is enabled; - these options defend against cross-site - scripting. - - - Edit the openstack-dashboard.conf - file as shown in : - - - Before - WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi -WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10 -Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/ -<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi> -# For Apache http server 2.2 and earlier: -Order allow,deny -Allow from all - -# For Apache http server 2.4 and later: -# Require all granted -</Directory> - - - After - <VirtualHost *:80> -ServerName openstack.example.com -<IfModule mod_rewrite.c> -RewriteEngine On -RewriteCond %{HTTPS} off -RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} -</IfModule> -<IfModule !mod_rewrite.c> -RedirectPermanent / https://openstack.example.com -</IfModule> -</VirtualHost> -<VirtualHost *:443> -ServerName openstack.example.com - -SSLEngine On -# Remember to replace certificates and keys with valid paths in your environment -SSLCertificateFile /etc/apache2/SSL/openstack.example.com.crt -SSLCACertificateFile /etc/apache2/SSL/openstack.example.com.crt -SSLCertificateKeyFile /etc/apache2/SSL/openstack.example.com.key -SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown - -# HTTP Strict Transport Security (HSTS) enforces that all communications -# with a server go over SSL. This mitigates the threat from attacks such -# as SSL-Strip which replaces links on the wire, stripping away https prefixes -# and potentially allowing an attacker to view confidential information on the -# wire -Header add Strict-Transport-Security "max-age=15768000" - -WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi -WSGIDaemonProcess horizon user=www-data group=www-data processes=3 threads=10 -Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/ -<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi> -# For Apache http server 2.2 and earlier: -Order allow,deny -Allow from all - -# For Apache http server 2.4 and later: -# Require all granted -</Directory> -</VirtualHost> - - In this configuration, the Apache HTTP server - listens on port 443 and redirects all non-secure - requests to the HTTPS protocol. The secured section - defines the private key, public key, and certificate - to use. - - - Restart the Apache HTTP server. - For Debian, Ubuntu, or SUSE distributions: - # service apache2 restart - For Fedora, RHEL, or CentOS distributions: - # service httpd restart - - - Restart memcached: - # service memcached restart - If you try to access the dashboard through HTTP, the - browser redirects you to the HTTPS page. - - - - Configuring the dashboard for HTTPS also requires enabling SSL - for the noVNC proxy service. - On the controller node, add the following additional options to the - [DEFAULT] - section of the - /etc/nova/nova.conf - file: - [DEFAULT] -... -ssl_only = true -cert = /etc/apache2/SSL/openstack.example.com.crt -key = /etc/apache2/SSL/openstack.example.com.key - On the compute nodes, ensure the nonvncproxy_base_url - option points to a URL with an HTTPS scheme: - [DEFAULT] -... -novncproxy_base_url = https://controller:6080/vnc_auto.html - -
diff --git a/doc/common/section_dashboard-configure.xml b/doc/common/section_dashboard-configure.xml deleted file mode 100644 index 3225535c98..0000000000 --- a/doc/common/section_dashboard-configure.xml +++ /dev/null @@ -1,19 +0,0 @@ - -
- Configure the dashboard - - You can configure the dashboard for a simple HTTP - deployment. - You can configure the dashboard for a secured HTTPS - deployment. While the standard installation uses a - non-encrypted HTTP channel, you can enable SSL support for the - dashboard. - Also, you can configure the size of the VNC window in the - dashboard. - - -
diff --git a/doc/common/section_dashboard_customizing.xml b/doc/common/section_dashboard_customizing.xml deleted file mode 100644 index 9b5efa8cae..0000000000 --- a/doc/common/section_dashboard_customizing.xml +++ /dev/null @@ -1,183 +0,0 @@ - -
- Customize the dashboard - Once you have the dashboard installed you can customize the way it looks and feels to suit your own needs. - - The OpenStack dashboard by default on Ubuntu installs the openstack-dashboard-ubuntu-theme package. - If you do not want to use this theme you can remove it and its dependencies using the following command: - # apt-get remove --auto-remove openstack-dashboard-ubuntu-theme - - - This guide focuses on the local_settings.py file, stored in /openstack-dashboard/openstack_dashboard/local/. - - This guide is adapted from How To Custom Brand The OpenStack "Horizon" Dashboard. - The following can easily be customized: - - - Site colors - - - Logo - - - HTML title - - - Site branding link - - - Help URL - - - - - - - Logo and site colors - - Create two logo files, png format, with transparent backgrounds using the following sizes: - - - Login screen: 365 x 50 - - - Logged in banner: 216 x 35 - - - - - - Upload your new images to the following location: - /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/img/ - - - - - Create a CSS style sheet in the following directory: - /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/ - - - - - Change the colors and image file names as appropriate, though the relative directory paths should be the same. The following example file shows you how to customize your CSS file: - - /* -* New theme colors for dashboard that override the defaults: -* dark blue: #355796 / rgb(53, 87, 150) -* light blue: #BAD3E1 / rgb(186, 211, 225) -* -* By Preston Lee <plee@tgen.org> -*/ -h1.brand { -background: #355796 repeat-x top left; -border-bottom: 2px solid #BAD3E1; -} -h1.brand a { -background: url(../img/my_cloud_logo_small.png) top left no-repeat; -} -#splash .login { -background: #355796 url(../img/my_cloud_logo_medium.png) no-repeat center 35px; -} -#splash .login .modal-header { -border-top: 1px solid #BAD3E1; -} -.btn-primary { -background-image: none !important; -background-color: #355796 !important; -border: none !important; -box-shadow: none; -} -.btn-primary:hover, -.btn-primary:active { -border: none; -box-shadow: none; -background-color: #BAD3E1 !important; -text-decoration: none; -} - - - Open the following HTML template in an editor of your choice: - /usr/share/openstack-dashboard/openstack_dashboard/templates/_stylesheets.html - - - - Add a line to include your newly created style sheet. For example - custom.css file: - ... - <link href='{{ STATIC_URL }}bootstrap/css/bootstrap.min.css' media='screen' rel='stylesheet' /> - <link href='{{ STATIC_URL }}dashboard/css/{% choose_css %}' media='screen' rel='stylesheet' /> - <link href='{{ STATIC_URL }}dashboard/css/custom.css' media='screen' rel='stylesheet' /> - ... - - - Restart the Apache service. - - - To view your changes simply reload your dashboard. If necessary go back and modify your CSS file as appropriate. - - - - HTML title - - Set the HTML title, which appears at the top of the browser window, by adding the following line to - local_settings.py: - - SITE_BRANDING = "Example, Inc. Cloud" - - - - - Restart Apache for this change to take effect. - - - - HTML title - - The logo also acts as a hyperlink. The default behavior is to redirect to horizon:user_home. To change this, add the following attribute to local_settings.py - SITE_BRANDING_LINK = "http://example.com" - - - Restart Apache for this change to take effect. - - - - Help URL - - By default the help URL points to http://docs.openstack.org. Change this by editing the following arritbute to the URL of your choice in local_settings.py - 'help_url': "http://openstack.mycompany.org", - - - Restart Apache for this change to take effect. - - -
- diff --git a/doc/common/section_fibrechannel.xml b/doc/common/section_fibrechannel.xml deleted file mode 100644 index 526c399e09..0000000000 --- a/doc/common/section_fibrechannel.xml +++ /dev/null @@ -1,56 +0,0 @@ - -
- Fibre Channel support in Compute - Fibre Channel support in OpenStack Compute is remote block - storage attached to compute nodes for VMs. - - In the Grizzly release, Fibre Channel supported only the KVM - hypervisor. - Compute and Block Storage support Fibre Channel automatic zoning on - Brocade and Cisco switches. On other hardware Fibre Channel arrays must - be pre-zoned or directly attached to the KVM hosts. -
- KVM host requirements - You must install these packages on the KVM host: - - - - sysfsutils - Nova uses the - systool application in this - package. - - - - sg3-utils or sg3_utils - Nova uses the - sg_scan and - sginfo applications. - - - Installing the multipath-tools - package is optional. -
-
- Install required packages - Use these commands to install the system - packages: - - - For systems running openSUSE or SUSE Linux Enterprise - Server: - # zypper install sysfsutils sg3_utils multipath-tools - - - For systems running Red Hat: - # yum install sysfsutils sg3_utils device-mapper-multipath - - - For systems running Ubuntu: - # apt-get install sysfsutils sg3-utils multipath-tools - - -
-
diff --git a/doc/common/section_kvm_enable.xml b/doc/common/section_kvm_enable.xml deleted file mode 100644 index fe58aed609..0000000000 --- a/doc/common/section_kvm_enable.xml +++ /dev/null @@ -1,146 +0,0 @@ - -
- Enable KVM - The following sections outline how to enable KVM based - hardware virtualisation on different architectures - and platforms. To perform these steps, you must be logged - in as the root user. -
- For x86 based systems - - - To determine whether the svm or - vmx CPU extensions are present, - run this command: - # grep -E 'svm|vmx' /proc/cpuinfo - This command generates output if the CPU is - capable of hardware-virtualization. Even if output is - shown, you might still need to enable virtualization - in the system BIOS for full support. - If no output appears, consult your system - documentation to ensure that your CPU and motherboard - support hardware virtualization. Verify that any - relevant hardware virtualization options are enabled - in the system BIOS. - The BIOS for each manufacturer is different. If you - must enable virtualization in the BIOS, look for an - option containing the words - virtualization, - VT, VMX, or - SVM. - - - To list the loaded kernel modules and verify that - the kvm modules are loaded, run - this command: - # lsmod | grep kvm - If the output includes - kvm_intel or - kvm_amd, the - kvm hardware - virtualization modules are loaded and your kernel - meets the module requirements for OpenStack - Compute. - If the output does not show that the - kvm module is loaded, run this - command to load it: - # modprobe -a kvm - Run the command for your CPU. For Intel, run this - command: - # modprobe -a kvm-intel - For AMD, run this command: - # modprobe -a kvm-amd - Because a KVM installation can change user group - membership, you might need to log in again for changes - to take effect. - If the kernel modules do not load automatically, use - the procedures listed in these subsections. - - - If the checks indicate that required hardware virtualization - support or kernel modules are disabled or unavailable, you - must either enable this support on the system or find a system - with this support. - - Some systems require that you enable VT support in the - system BIOS. If you believe your processor supports - hardware acceleration but the previous command did not - produce output, reboot your machine, enter the system - BIOS, and enable the VT option. - - If KVM acceleration is not supported, configure Compute to - use a different hypervisor, such as QEMU or Xen. - These procedures help you load the kernel modules for - Intel-based and AMD-based processors if they do not load - automatically during KVM installation. -
- Intel-based processors - If your compute host is Intel-based, run these commands - as root to load the kernel modules: - # modprobe kvm -# modprobe kvm-intel - Add these lines to the /etc/modules - file so that these modules load on reboot: - kvm -kvm-intel -
-
- AMD-based processors - If your compute host is AMD-based, run these commands as - root to load the kernel modules: - # modprobe kvm -# modprobe kvm-amd - Add these lines to /etc/modules - file so that these modules load on reboot: - kvm -kvm-amd -
-
- -
- For POWER based systems - KVM as a hypervisor is supported on POWER system's PowerNV - platform. - - - To determine if your POWER platform - supports KVM based virtualization run the - following command: - #cat /proc/cpuinfo | grep PowerNV - If the previous command generates the following output, - then CPU supports KVM based virtualization - platform: PowerNV - If no output is displayed, then your POWER platform does not - support KVM based hardware virtualization. - - - To list the loaded kernel modules and verify that - the kvm modules are loaded, run - the following command: - # lsmod | grep kvm - If the output includes - kvm_hv, the - kvm hardware - virtualization modules are loaded and your kernel - meets the module requirements for OpenStack Compute. - If the output does not show that the - kvm module is loaded, run the - following command to load it: - # modprobe -a kvm - For PowerNV platform, run the following command: - # modprobe -a kvm-hv - Because a KVM installation can change user group - membership, you might need to log in again for changes - to take effect. - - -
-
diff --git a/doc/config-reference/source/block-storage/block-storage-sample-configuration-files.rst b/doc/config-reference/source/block-storage/block-storage-sample-configuration-files.rst index 55f82d28b6..ebe3bccf4c 100644 --- a/doc/config-reference/source/block-storage/block-storage-sample-configuration-files.rst +++ b/doc/config-reference/source/block-storage/block-storage-sample-configuration-files.rst @@ -16,7 +16,7 @@ When you manually install the Block Storage service, the options in the The ``cinder.conf`` file contains most of the options to configure the Block Storage service. -.. literalinclude:: ../../../common/samples/cinder.conf.sample +.. literalinclude:: ../samples/cinder.conf.sample :language: ini api-paste.ini diff --git a/doc/config-reference/source/block-storage/drivers/ceph-rbd-volume-driver.rst b/doc/config-reference/source/block-storage/drivers/ceph-rbd-volume-driver.rst index c72944c348..ef7517ead4 100644 --- a/doc/config-reference/source/block-storage/drivers/ceph-rbd-volume-driver.rst +++ b/doc/config-reference/source/block-storage/drivers/ceph-rbd-volume-driver.rst @@ -15,7 +15,7 @@ kernel and is integrated with the OpenStack cloud operating system. Due to its open-source nature, you can install and use this portable storage platform in public or private clouds. -.. figure:: ../../../../common/figures/ceph/ceph-architecture.png +.. figure:: ../../figures/ceph-architecture.png Ceph architecture diff --git a/doc/config-reference/source/compute/hypervisor-vmware.rst b/doc/config-reference/source/compute/hypervisor-vmware.rst index d8a83fe426..62539abd89 100644 --- a/doc/config-reference/source/compute/hypervisor-vmware.rst +++ b/doc/config-reference/source/compute/hypervisor-vmware.rst @@ -31,7 +31,7 @@ architecture: **VMware driver architecture** -.. figure:: ../../../common/figures/vmware-nova-driver-architecture.jpg +.. figure:: ../figures/vmware-nova-driver-architecture.jpg :width: 100% As the figure shows, the OpenStack Compute Scheduler sees diff --git a/doc/config-reference/source/compute/hypervisor-xen-api.rst b/doc/config-reference/source/compute/hypervisor-xen-api.rst index c9ea507ca8..586fb729cd 100644 --- a/doc/config-reference/source/compute/hypervisor-xen-api.rst +++ b/doc/config-reference/source/compute/hypervisor-xen-api.rst @@ -118,7 +118,7 @@ XenAPI deployment architecture A basic OpenStack deployment on a XAPI-managed server, assuming that the network provider is nova-network, looks like this: -.. figure:: ../../../common/figures/xenserver_architecture.png +.. figure:: ../figures/xenserver_architecture.png :width: 100% Key things to note: diff --git a/doc/common/figures/ceph/ceph-architecture.png b/doc/config-reference/source/figures/ceph-architecture.png similarity index 100% rename from doc/common/figures/ceph/ceph-architecture.png rename to doc/config-reference/source/figures/ceph-architecture.png diff --git a/doc/common/figures/vmware-nova-driver-architecture.jpg b/doc/config-reference/source/figures/vmware-nova-driver-architecture.jpg similarity index 100% rename from doc/common/figures/vmware-nova-driver-architecture.jpg rename to doc/config-reference/source/figures/vmware-nova-driver-architecture.jpg diff --git a/doc/common/figures/xenserver_architecture.png b/doc/config-reference/source/figures/xenserver_architecture.png similarity index 100% rename from doc/common/figures/xenserver_architecture.png rename to doc/config-reference/source/figures/xenserver_architecture.png diff --git a/doc/common/figures/xenserver_architecture.svg b/doc/config-reference/source/figures/xenserver_architecture.svg similarity index 100% rename from doc/common/figures/xenserver_architecture.svg rename to doc/config-reference/source/figures/xenserver_architecture.svg diff --git a/doc/common/samples/ceilometer.conf b/doc/config-reference/source/samples/ceilometer.conf similarity index 100% rename from doc/common/samples/ceilometer.conf rename to doc/config-reference/source/samples/ceilometer.conf diff --git a/doc/common/samples/cinder.conf.sample b/doc/config-reference/source/samples/cinder.conf.sample similarity index 100% rename from doc/common/samples/cinder.conf.sample rename to doc/config-reference/source/samples/cinder.conf.sample diff --git a/doc/common/samples/manila.conf.sample b/doc/config-reference/source/samples/manila.conf.sample similarity index 100% rename from doc/common/samples/manila.conf.sample rename to doc/config-reference/source/samples/manila.conf.sample diff --git a/doc/config-reference/source/shared-file-systems/sample-configuration-files.rst b/doc/config-reference/source/shared-file-systems/sample-configuration-files.rst index 2d88b6d731..cb33dd02c2 100644 --- a/doc/config-reference/source/shared-file-systems/sample-configuration-files.rst +++ b/doc/config-reference/source/shared-file-systems/sample-configuration-files.rst @@ -14,7 +14,7 @@ in the ``manila.conf`` file are set to default values. The ``manila.conf`` file contains most of the options to configure the Shared File Systems service. -.. literalinclude:: ../../../common/samples/manila.conf.sample +.. literalinclude:: ../samples/manila.conf.sample :language: ini api-paste.ini diff --git a/doc/config-reference/source/telemetry/sample-configuration-files.rst b/doc/config-reference/source/telemetry/sample-configuration-files.rst index 18e374c3ae..fa6afab35b 100644 --- a/doc/config-reference/source/telemetry/sample-configuration-files.rst +++ b/doc/config-reference/source/telemetry/sample-configuration-files.rst @@ -13,7 +13,7 @@ The configuration for the Telemetry services and agents is found in the This file must be modified after installation. -.. literalinclude:: ../../../common/samples/ceilometer.conf +.. literalinclude:: ../samples/ceilometer.conf :language: ini event_definitions.yaml