diff options
| -rw-r--r-- | block-storage.yaml | 26 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 2 | ||||
| -rw-r--r-- | swift-source.yaml | 4 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 2 | ||||
| -rw-r--r-- | undercloud-source.yaml | 11 |
5 files changed, 16 insertions, 29 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index 3e5f460b..761de523 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -49,7 +49,6 @@ resources: get_param: CinderPassword iscsi-helper: get_param: CinderISCSIHelper - admin-password: {get_param: AdminPassword} rabbit: host: {get_input: controller_host} username: {get_param: RabbitUserName} @@ -63,28 +62,3 @@ resources: enable_tunneling: {get_param: NeutronEnableTunnelling} service-password: get_param: NeutronPassword - config: - keystone: - host: {get_input: controller_host} - cinder: - db: {get_input: cinder_dsn} - volume_size_mb: - get_param: CinderLVMLoopDeviceSize - service-password: - get_param: CinderPassword - iscsi-helper: - get_param: CinderISCSIHelper - admin-password: {get_param: AdminPassword} - rabbit: - host: {get_input: controller_host} - username: {get_param: RabbitUserName} - password: {get_param: RabbitPassword} - interfaces: - control: {get_param: NeutronPublicInterface} - neutron: - ovs: - local_ip: { get_input: neutron_local_ip } - tenant_network_type: {get_param: NeutronNetworkType} - enable_tunneling: {get_param: NeutronEnableTunnelling} - service-password: - get_param: NeutronPassword diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index 081ca81a..ef440a3d 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -40,7 +40,7 @@ resources: service-password: {get_input: neutron_password} admin-password: {get_input: admin_password} rabbit: - username: {get_input: rabbit_user_name} + username: {get_input: rabbit_username} password: {get_input: rabbit_password} live-update: host: {get_input: live_update_host} diff --git a/swift-source.yaml b/swift-source.yaml index a0336872..9c7b04f5 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -12,7 +12,7 @@ resources: replicas: 1 service-password: { get_input: swift_password } neutron: - enable_tunnelling: {get_param: NeutronEnableTunnelling} - tenant_network_type: {get_param: NeutronNetworkType} ovs: local_ip: { get_input: neutron_local_ip } + enable_tunnelling: { get_input: neutron_enable_tunnelling} + tenant_network_type: { get_input: neutron_tenant_network_type} diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 97f7fa76..fbedb0bf 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -44,6 +44,8 @@ resources: signal_transport: NO_SIGNAL input_values: neutron_local_ip: {get_attr: [SwiftStorage0, networks, ctlplane, 0]} + neutron_tenant_network_type: {get_param: NeutronNetworkType} + neutron_enable_tunneling: {get_param: NeutronEnableTunnelling} swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} swift_devices: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index be743ce3..a3bba63d 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -205,6 +205,17 @@ resources: get_param: NeutronPublicInterfaceIP controller-address: get_input: controller_host + corosync: + bindnetaddr: {get_input: controller_host} + mcastport: 5577 + nodes: + Merge::Map: + controller0: + ip: {get_attr: [undercloud, networks, ctlplane, 0]} + pacemaker: + stonith_enabled : false + recheck_interval : 5 + quorum_policy : ignore ceilometer: db: mysql://ceilometer:unset@localhost/ceilometer metering_secret: {get_param: CeilometerMeteringSecret} |