diff options
| -rw-r--r-- | overcloud-source.yaml | 8 | ||||
| -rw-r--r-- | undercloud-source.yaml | 35 |
2 files changed, 35 insertions, 8 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 413bfbac..e4439f0e 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -256,17 +256,10 @@ Parameters: Default: '' Description: Keystone self-signed certificate authority certificate. Type: String - NoEcho: true - KeystoneCAKey: - Default: '' - Description: Keystone certificate authority key. - Type: String - NoEcho: true KeystoneSigningCertificate: Default: '' Description: Keystone certificate for verifying token validity. Type: String - NoEcho: true KeystoneSigningKey: Default: '' Description: Keystone key for signing tokens. @@ -452,7 +445,6 @@ Resources: db: mysql://keystone:unset@localhost/keystone host: get_input: controller_host - ca_key: {Ref: KeystoneCAKey} ca_certificate: {Ref: KeystoneCACertificate} signing_key: {Ref: KeystoneSigningKey} signing_certificate: {Ref: KeystoneSigningCertificate} diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 018cbf51..66517586 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -128,6 +128,18 @@ Parameters: Description: The password for the nova service account, used by nova-api. Type: String NoEcho: true + NeutronPublicInterfaceDefaultRoute: + Default: '' + Description: A custom default route for the NeutronPublicInterface. + Type: String + NeutronPublicInterfaceIP: + Default: '' + Description: A custom IP address to put onto the NeutronPublicInterface. + Type: String + NeutronPublicInterfaceRawDevice: + Default: '' + Description: If set, the public interface is a vlan with this device as the raw device. + Type: String NtpServer: Type: String Default: '' @@ -156,6 +168,19 @@ Parameters: lower level default. Type: Number Default: 0 + KeystoneCACertificate: + Default: '' + Description: Keystone self-signed certificate authority certificate. + Type: String + KeystoneSigningCertificate: + Default: '' + Description: Keystone certificate for verifying token validity. + Type: String + KeystoneSigningKey: + Default: '' + Description: Keystone key for signing tokens. + Type: String + NoEcho: true Resources: RabbitCookie: Type: OS::Heat::RandomString @@ -186,6 +211,9 @@ Resources: - undercloud - show nodeid: {get_input: bootstack_nodeid} + bootstack: + public_interface_ip: + Ref: NeutronPublicInterfaceIP controller-address: get_input: controller_host ceilometer: @@ -226,6 +254,9 @@ Resources: keystone: db: mysql://keystone:unset@localhost/keystone host: 127.0.0.1 + ca_certificate: {Ref: KeystoneCACertificate} + signing_key: {Ref: KeystoneSigningKey} + signing_certificate: {Ref: KeystoneSigningCertificate} mysql: innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize} neutron: @@ -234,6 +265,10 @@ Resources: ovs: public_interface: Ref: NeutronPublicInterface + public_interface_raw_device: + Ref: NeutronPublicInterfaceRawDevice + public_interface_route: + Ref: NeutronPublicInterfaceDefaultRoute physical_bridge: br-ctlplane physical_network: ctlplane network_vlan_ranges: ctlplane |