gistfile1.txt

 jtaleric  …  tripleo-heat-templates  puppet  services  git diff
diff --cc puppet/services/glance-api.yaml
index ce389dc,9cc8595..0000000
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@@ -100,7 -161,7 +101,11 @@@ outputs
              glance::api::authtoken::password: {get_param: GlancePassword}
              glance::api::enable_proxy_headers_parsing: true
              glance::api::debug: {get_param: Debug}
++<<<<<<< HEAD
 +            glance::api::workers: {get_param: GlanceWorkers}
++=======
+             glance::policy::policies: {get_param: GlanceApiPolicies}
++>>>>>>> 0991ed0... Merge "Use conditionals for neutron and glance worker defaults"
              tripleo.glance_api.firewall_rules:
                '112 glance_api':
                  dport:
@@@ -132,10 -193,46 +137,51 @@@
                - use_tls_proxy
                - 'localhost'
                - {get_param: [ServiceNetMap, GlanceApiNetwork]}
++<<<<<<< HEAD
++=======
+             glance_notifier_strategy: {get_param: GlanceNotifierStrategy}
+             glance_log_file: {get_param: GlanceLogFile}
+             glance::backend::swift::swift_store_auth_address: {get_param: [EndpointMap, KeystoneInternal, uri] }
+             glance::backend::swift::swift_store_user: service:glance
+             glance::backend::swift::swift_store_key: {get_param: GlancePassword}
+             glance::backend::swift::swift_store_create_container_on_put: true
+             glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
+             glance::backend::rbd::rbd_store_user: {get_param: CephClientUserName}
+             glance_backend: {get_param: GlanceBackend}
+             glance::notify::rabbitmq::rabbit_userid: {get_param: RabbitUserName}
+             glance::notify::rabbitmq::rabbit_port: {get_param: RabbitClientPort}
+             glance::notify::rabbitmq::rabbit_password: {get_param: RabbitPassword}
+             glance::notify::rabbitmq::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
+             glance::notify::rabbitmq::notification_driver: messagingv2
+             tripleo::profile::base::glance::api::glance_nfs_enabled: {get_param: GlanceNfsEnabled}
+             tripleo::glance::nfs_mount::share: {get_param: GlanceNfsShare}
+             tripleo::glance::nfs_mount::options: {get_param: GlanceNfsOptions}
+           -
+             if:
+             - glance_workers_unset
+             - {}
+             - glance::api::workers: {get_param: GlanceWorkers}
+       service_config_settings:
+         keystone:
+           glance::keystone::auth::public_url: {get_param: [EndpointMap, GlancePublic, uri]}
+           glance::keystone::auth::internal_url: {get_param: [EndpointMap, GlanceInternal, uri]}
+           glance::keystone::auth::admin_url: {get_param: [EndpointMap, GlanceAdmin, uri]}
+           glance::keystone::auth::password: {get_param: GlancePassword }
+           glance::keystone::auth::region: {get_param: KeystoneRegion}
+           glance::keystone::auth::tenant: 'service'
+         mysql:
+           glance::db::mysql::password: {get_param: GlancePassword}
+           glance::db::mysql::user: glance
+           glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+           glance::db::mysql::dbname: glance
+           glance::db::mysql::allowed_hosts:
+             - '%'
+             - "%{hiera('mysql_bind_host')}"
++>>>>>>> 0991ed0... Merge "Use conditionals for neutron and glance worker defaults"
        step_config: |
          include ::tripleo::profile::base::glance::api
 +      service_config_settings:
 +        get_attr: [GlanceBase, role_data, service_config_settings]
        upgrade_tasks:
          - name: Check if glance_api is deployed
            command: systemctl is-enabled openstack-glance-api
diff --cc puppet/services/neutron-api.yaml
index 9e7a54c,a0305b8..0000000
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@@ -87,7 -92,7 +87,11 @@@ parameter_groups
  
  conditions:
    use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
++<<<<<<< HEAD
 +  neutron_workers_unset: {equals: [{get_param: NeutronWorkers}, '']}
++=======
+   neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']}
++>>>>>>> 0991ed0... Merge "Use conditionals for neutron and glance worker defaults"
  
  resources: