Quantum -> Neutron rename

Almost all references to quantum have been changed
neutron in tripleo-image-elements.

Change-Id: Ib17353d5834dd95d0348f62111074180c6e47181

diff --git a/Makefile b/Makefile
index 3f38859..7b707a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml
+NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml neutron.yaml mysql.yaml rabbitmq.yaml
 
 notcompute.yaml: $(NOTCOMPUTE)
        python merge.py --master-role notcompute --slave-roles stateless stateful -- $^ > notcompute.yaml

diff --git a/bootstack-vm.yaml b/bootstack-vm.yaml
index 67b647e..f55633b 100644 (file)
--- a/bootstack-vm.yaml
+++ b/bootstack-vm.yaml
@@ -1,4 +1,4 @@
-Description: Nova API,Keystone,Heat Engine and API,Glance,Quantum,Dedicated MySQL
+Description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
   server,Dedicated RabbitMQ Server
 HeatTemplateFormatVersion: '2012-12-12'
 Parameters:
@@ -36,7 +36,7 @@ Resources:
   notcompute:
     Metadata:
       OpenStack::Heat::Stack: {}
-      Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, heat-localip, quantum-network-node ]
+      Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, heat-localip, neutron-network-node ]
       admin-password: unset
       admin-token: unset
       controller-address: 0.0.0.0
@@ -78,13 +78,13 @@ Resources:
         compute_driver: libvirt.LibvirtDriver
         db: mysql://nova:unset@localhost/nova
         host: 0.0.0.0
-      quantum:
+      neutron:
         floatingip_end: 192.0.2.64
         floatingip_range: 192.0.2.0/24
         floatingip_start: 192.0.2.45
         host: 0.0.0.0
         metadata_proxy_shared_secret: unset
-        ovs_db: mysql://quantum:unset@localhost/ovs_quantum?charset=utf8
+        ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         ovs:
           public_interface: eth0
           fixed_range:

diff --git a/notcompute.yaml b/notcompute.yaml
index 2e598c0..6eb86f8 100644 (file)
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -1,4 +1,4 @@
-Description: Nova API,Keystone,Heat Engine and API,Glance,Quantum,Dedicated MySQL
+Description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
   server,Dedicated RabbitMQ Server
 HeatTemplateFormatVersion: '2012-12-12'
 Parameters:
@@ -47,10 +47,10 @@ Parameters:
   NovaInterfaces:
     Default: eth0
     Type: String
-  QuantumDBPassword:
-    Description: Password for connecting to quantum database
+  NeutronDBPassword:
+    Description: Password for connecting to neutron database
     Type: String
-  QuantumInterfaces:
+  NeutronInterfaces:
     Default: eth0
     Type: String
   RabbitMQPassword:
@@ -107,9 +107,9 @@ Resources:
           - database: nova
             username: nova
             password: {Ref: NovaDBPassword}
-          - database: quantum
-            username: quantum
-            password: {Ref: QuantumDBPassword}
+          - database: neutron
+            username: neutron
+            password: {Ref: NeutronDBPassword}
       glance:
         db:
           Fn::Join:
@@ -157,15 +157,15 @@ Resources:
             - - 'mysql://nova:'
               - {Ref: NovaDBPassword}
               - '@127.0.0.1/nova'
-      quantum:
+      neutron:
         host:
           '127.0.0.1'
         ovs_db:
           Fn::Join:
             - ''
-            - - 'mysql://quantum:'
-              - {Ref: QuantumDBPassword}
-              - '@127.0.0.1/ovs_quantum'
+            - - 'mysql://neutron:'
+              - {Ref: NeutronDBPassword}
+              - '@127.0.0.1/ovs_neutron'
       rabbit:
         host:
           '127.0.0.1'

diff --git a/nova-api.yaml b/nova-api.yaml
index 6efc108..3f4fc87 100644 (file)
--- a/nova-api.yaml
+++ b/nova-api.yaml
@@ -64,8 +64,8 @@ Resources:
         host: {Ref: KeystoneHost}
       nova:
         db: {Ref: NovaDSN}
-      quantum:
-        host: {Ref: QuantumHost}
+      neutron:
+        host: {Ref: NeutronHost}
       service-password: {Ref: ServicePassword}
       admin-password: {Ref: ServicePassword}
       rabbit:

diff --git a/nova-compute-group.yaml b/nova-compute-group.yaml
index 90e1bb0..89f4a75 100644 (file)
--- a/nova-compute-group.yaml
+++ b/nova-compute-group.yaml
@@ -17,7 +17,7 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in nova.
     Type: String
-  QuantumHost:
+  NeutronHost:
     Type: String
   RabbitHost:
     Type: String
@@ -38,7 +38,7 @@ Parameters:
     Default: https://raw.github.com/stackforge/tripleo-heat-templates/master/nova-compute-instance.yaml
   NovaDSN:
     Type: String
-  QuantumDSN:
+  NeutronDSN:
     Type: String
 Resources:
   NovaCompute0:
@@ -50,7 +50,7 @@ Resources:
         KeyName: {Ref: KeyName}
         KeystoneHost: {Ref: KeystoneHost}
         ServicePassword: {Ref: ServicePassword}
-        QuantumHost: {Ref: QuantumHost}
+        NeutronHost: {Ref: NeutronHost}
         RabbitHost: {Ref: RabbitHost}
         RabbitPassword: {Ref: RabbitPassword}
         NovaInterfaces: {Ref: NovaInterfaces}
@@ -58,5 +58,5 @@ Resources:
         NovaApiHost: {Ref: NovaApiHost}
         GlanceHost: {Ref: GlanceHost}
         NovaDSN: {Ref: NovaDSN}
-        QuantumDSN: {Ref: QuantumDSN}
+        NeutronDSN: {Ref: NeutronDSN}
       TemplateURL: {Ref: NovaComputeTemplate}

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 95fff89..548857a 100644 (file)
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -17,7 +17,7 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in nova.
     Type: String
-  QuantumHost:
+  NeutronHost:
     Type: String
   RabbitHost:
     Type: String
@@ -35,15 +35,15 @@ Parameters:
     Type: String
   NovaDSN:
     Type: String
-  QuantumDSN:
+  NeutronDSN:
     Type: String
-  QuantumBridgeMappings:
+  NeutronBridgeMappings:
     Type: String
-  QuantumNetworkVLANRanges:
+  NeutronNetworkVLANRanges:
     Type: String
-  QuantumNetworkType:
+  NeutronNetworkType:
     Type: String
-  QuantumEnableTunnelling:
+  NeutronEnableTunnelling:
     Type: String
 Resources:
   AccessPolicy:
@@ -86,15 +86,15 @@ Resources:
         host: {Ref: GlanceHost}
       keystone:
         host: {Ref: KeystoneHost}
-      quantum:
-        host: {Ref: QuantumHost}
-        ovs_db: {Ref: QuantumDSN}
+      neutron:
+        host: {Ref: NeutronHost}
+        ovs_db: {Ref: NeutronDSN}
         ovs:
           local_ip: 0.0.0.0
-          tenant_network_type: {Ref: QuantumNetworkType}
-          network_vlan_ranges: {Ref: QuantumNetworkVLANRanges}
-          bridge_mappings: {Ref: QuantumBridgeMappings}
-          enable_tunneling: {Ref: QuantumEnableTunnelling}
+          tenant_network_type: {Ref: NeutronNetworkType}
+          network_vlan_ranges: {Ref: NeutronNetworkVLANRanges}
+          bridge_mappings: {Ref: NeutronBridgeMappings}
+          enable_tunneling: {Ref: NeutronEnableTunnelling}
 
       service-password: {Ref: ServicePassword}
       admin-password: {Ref: ServicePassword}

diff --git a/nova-compute.yaml b/nova-compute.yaml
index 172e9a1..dd7db49 100644 (file)
--- a/nova-compute.yaml
+++ b/nova-compute.yaml
@@ -16,7 +16,7 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in nova.
     Type: String
-  QuantumHost:
+  NeutronHost:
     Type: String
   RabbitHost:
     Type: String
@@ -68,8 +68,8 @@ Resources:
         compute_driver: {Ref: NovaComputeDriver}
       keystone:
         host: {Ref: KeystoneHost}
-      quantum:
-        host: {Ref: QuantumHost}
+      neutron:
+        host: {Ref: NeutronHost}
       service-password: {Ref: ServicePassword}
       admin-password: {Ref: ServicePassword}
       rabbit:

diff --git a/quantum.yaml b/quantum.yaml
index 38f6ac8..57debec 100644 (file)
--- a/quantum.yaml
+++ b/quantum.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Quantum'
+Description: 'Neutron'
 Parameters:
   KeyName: 
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -9,28 +9,28 @@ Parameters:
     Description: Use this flavor
     Type: String
     Default: bm.small
-  QuantumDSN:
-    Description: DSN for connecting to quantum database
+  NeutronDSN:
+    Description: DSN for connecting to neutron database
     Type: String
-  QuantumImage:
+  NeutronImage:
     Type: String
   KeystoneHost:
     Type: String
   ServicePassword:
-    Description: admin_password for setting up auth in quantum.
+    Description: admin_password for setting up auth in neutron.
     Type: String
   RabbitHost:
     Type: String
   RabbitPassword:
     Type: String
-  QuantumInterfaces:
+  NeutronInterfaces:
     Type: String
     Default: eth0
 Resources:
   AccessPolicy:
     Type: OS::Heat::AccessPolicy
     Properties:
-      AllowedResources: [ Quantum ]
+      AllowedResources: [ Neutron ]
   User:
     Type: AWS::IAM::User
     Properties:
@@ -40,16 +40,16 @@ Resources:
     Properties:
       UserName:
         Ref: User
-  Quantum:
+  Neutron:
     Type: AWS::EC2::Instance
     Properties:
       ImageId:
-        {Ref: QuantumImage}
+        {Ref: NeutronImage}
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
     Metadata:
       OpenStack::Role: networking
-      OpenStack::ImageBuilder::Elements: [ quantum ]
+      OpenStack::ImageBuilder::Elements: [ neutron ]
       heat: 
         access_key_id:
           Ref: Key
@@ -59,11 +59,11 @@ Resources:
           name: {Ref: 'AWS::StackName'}
           region: {Ref: 'AWS::Region'}
         refresh:
-          - resource: Quantum
+          - resource: Neutron
       keystone:
         host: {Ref: KeystoneHost}
-      quantum:
-        ovs_db: {Ref: QuantumDSN}
+      neutron:
+        ovs_db: {Ref: NeutronDSN}
       service-password: {Ref: ServicePassword}
       admin-password: {Ref: ServicePassword}
       rabbit:
@@ -73,4 +73,4 @@ Resources:
         store_user: ''
         store_key: ''
       interfaces:
-        control: {Ref: QuantumInterfaces}
+        control: {Ref: NeutronInterfaces}

diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index ee846ce..9ba6285 100644 (file)
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -35,7 +35,7 @@ Resources:
   notcompute:
     Metadata:
       OpenStack::Heat::Stack: {}
-      Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, quantum-network-node ]
+      Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
       admin-password: unset
       admin-token: unset
       controller-address: 0.0.0.0
@@ -95,9 +95,9 @@ Resources:
             key: /opt/stack/boot-stack/virtual-power-key
             ssh_host: 192.168.122.1
             type: virsh
-      quantum:
+      neutron:
         host: 127.0.0.1
-        ovs_db: mysql://quantum:unset@localhost/ovs_quantum?charset=utf8
+        ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
         ovs:
           dnsmasq_range: [192.0.2.25, 192.0.2.44]
           public_interface: eth0